diff --git a/README.md b/README.md
deleted file mode 100644
index 9d7b552ba..000000000
--- a/README.md
+++ /dev/null
@@ -1,227 +0,0 @@
-[![CircleCI](https://circleci.com/gh/EthWorks/Waffle.svg?style=svg)](https://circleci.com/gh/EthWorks/Waffle)
-[![](https://img.shields.io/npm/v/ethereum-waffle.svg)](https://www.npmjs.com/package/ethereum-waffle)
-
-![Ethereum Waffle](https://raw.githubusercontent.com/EthWorks/Waffle/master/docs/source/logo.png)
-
-Library for writing and testing smart contracts.
-
-Sweeter, simpler and faster than Truffle.
-
-## Links
-* Website - https://getwaffle.io/
-* Documentation - https://ethereum-waffle.readthedocs.io/
-
-## Philosophy
-* __Simpler__: Minimalistic, few dependencies.
-* __Sweeter__: Nice syntax, easy to extend.
-* __Faster__: Strong focus on the speed of test execution.
-
-## Features:
-* Sweet set of chai matchers, e.g.:
-  * `expect(...).to.be.revertedWith('Error message')`
-  * `expect(...).to.emit(contract, 'EventName).withArgs(...)`)
-* Importing contracts from npm modules working out of the box, e.g.:
-  * `import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";`
-* Fixtures that help write fast and maintainable test suites, e.g.:
-  * `const {token} = await loadFixture(standardTokenWithBalance);`
-* Customizable compilation options with native solc, dockerized solc and any version of solc-js loaded remotely at compiled time
-* Support for promise-based configuration, e.g.:
-  * use native solc binary for fast compilation in CI environment
-  * use solc-js based on contract versions detected (async)
-* Support for TypeScript
-* [Documentation](https://ethereum-waffle.readthedocs.io/en/latest/)
-
-## Documentation
-Documentation is available [here](https://ethereum-waffle.readthedocs.io/en/latest/).
-
-## Installation:
-
-To get started install `ethereum-waffle` with yarn:
-```
-yarn add --dev ethereum-waffle
-```
-
-Or if you prefer using npm:
-```
-npm install --save-dev ethereum-waffle
-```
-
-## Step by step guide
-
-### Add external dependency:
-To add an external library install it using npm:
-
-```sh
-npm i openzeppelin-solidity -D
-```
-
-or with yarn:
-
-```sh
-yarn add openzeppelin-solidity -D
-```
-
-### Example contract
-Below is an example contract written in Solidity. Place it in `contracts/BasicToken.sol` file of your project:
-
-```solidity
-// contracts/BasicToken.sol
-pragma solidity ^0.5.1;
-
-import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
-
-// Example class - a mock class using delivering from ERC20
-contract BasicToken is ERC20 {
-  constructor(address initialAccount, uint256 initialBalance) public {
-    super._mint(initialAccount, initialBalance);
-  }
-}
-```
-
-### Example test
-Below is an example test written for the contract above compiled with Waffle. Place it under `test/BasicToken.js` file of your project:
-
-```js
-// test/BasicToken.js
-const {use, expect} = require('chai');
-const {MockProvider, deployContract, solidity} = require('ethereum-waffle');
-const BasicToken = require('../build/BasicToken');
-
-use(solidity);
-
-describe('BasicToken', () => {
-  const [wallet, walletTo] = new MockProvider().getWallets();
-  let token;
-
-  beforeEach(async () => {
-    token = await deployContract(wallet, BasicTokenMock, [wallet.address, 1000]);
-  });
-
-  it('Assigns initial balance', async () => {
-    expect(await token.balanceOf(wallet.address)).to.equal(1000);
-  });
-
-  it('Transfer adds amount to destination account', async () => {
-    await token.transfer(walletTo.address, 7);
-    expect(await token.balanceOf(walletTo.address)).to.equal(7);
-  });
-
-  it('Transfer emits event', async () => {
-    await expect(token.transfer(walletTo.address, 7))
-      .to.emit(token, 'Transfer')
-      .withArgs(wallet.address, walletTo.address, 7);
-  });
-
-  it('Can not transfer above the amount', async () => {
-    await expect(token.transfer(walletTo.address, 1007)).to.be.reverted;
-  });
-
-  it('Can not transfer from empty account', async () => {
-    const tokenFromOtherWallet = token.connect(walletTo);
-    await expect(tokenFromOtherWallet.transfer(wallet.address, 1))
-      .to.be.reverted;
-  });
-});
-```
-
-Note: You will also need to install following dependencies with to run the example above:
-
-```sh
-yarn add mocha -D
-yarn add chai -D
-```
-
-Or with npm:
-
-```
-npm i chai -D
-npm i mocha -D
-```
-
-### Compiling
-To compile your smart contracts run:
-
-```sh
-npx waffle
-```
-
-To compile using a custom configuration file run:
-
-```sh
-npx waffle config.json
-```
-
-Example configuration file looks like this (all fields optional):
-```json
-{
-  "sourcesPath": "./custom_contracts",
-  "targetPath": "./custom_build",
-  "npmPath": "./custom_node_modules"
-}
-```
-
-### Running tests
-To run the tests run the following command:
-
-```sh
-npx mocha
-```
-
-### Adding an npm script
-For convinience, you can add the following to your `package.json`:
-```
-{
-  ...,
-  "scripts": {
-    "test": "waffle && mocha"
-  }
-}
-```
-
-Now you can build and test your contracts with one command:
-
-```sh
-npm test
-```
-
-## Documentation
-For detailed feature walkthrough checkout [documentation](https://ethereum-waffle.readthedocs.io/en/latest/).
-
-## Contributing
-
-Contributions are always welcome, no matter how large or small. Before contributing, please read the [code of conduct](https://github.com/EthWorks/Waffle/blob/master/CODE_OF_CONDUCT.md) and [contribution policy](https://github.com/EthWorks/Waffle/blob/master/CONTRIBUTION.md).
-
-Before you issue pull request:
-
-Make sure all tests and linters pass.
-Make sure you have test coverage for any new features.
-
-### Running tests
-Note: To make end-to-end test pass, you need to:
-* have Docker installed, up and running
-* have Ethereum stable docker image pulled, if not run `docker pull ethereum/solc:stable`
-* have native solidity 0.5.* installed
-
-To run tests type:
-```sh
-yarn test
-```
-
-To run linter type:
-```sh
-yarn lint
-```
-
-Building documentation (requires Sphinx):
-```sh
-cd docs
-make html
-```
-
-## Roadmap
-
-See https://github.com/EthWorks/Waffle/issues/155
-
-## License
-
-Waffle is released under the [MIT License](https://opensource.org/licenses/MIT).
diff --git a/README.md b/README.md
new file mode 120000
index 000000000..ac7c8e46e
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+./waffle-cli/README.md
\ No newline at end of file
diff --git a/waffle-cli/README.md b/waffle-cli/README.md
new file mode 100644
index 000000000..9d7b552ba
--- /dev/null
+++ b/waffle-cli/README.md
@@ -0,0 +1,227 @@
+[![CircleCI](https://circleci.com/gh/EthWorks/Waffle.svg?style=svg)](https://circleci.com/gh/EthWorks/Waffle)
+[![](https://img.shields.io/npm/v/ethereum-waffle.svg)](https://www.npmjs.com/package/ethereum-waffle)
+
+![Ethereum Waffle](https://raw.githubusercontent.com/EthWorks/Waffle/master/docs/source/logo.png)
+
+Library for writing and testing smart contracts.
+
+Sweeter, simpler and faster than Truffle.
+
+## Links
+* Website - https://getwaffle.io/
+* Documentation - https://ethereum-waffle.readthedocs.io/
+
+## Philosophy
+* __Simpler__: Minimalistic, few dependencies.
+* __Sweeter__: Nice syntax, easy to extend.
+* __Faster__: Strong focus on the speed of test execution.
+
+## Features:
+* Sweet set of chai matchers, e.g.:
+  * `expect(...).to.be.revertedWith('Error message')`
+  * `expect(...).to.emit(contract, 'EventName).withArgs(...)`)
+* Importing contracts from npm modules working out of the box, e.g.:
+  * `import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";`
+* Fixtures that help write fast and maintainable test suites, e.g.:
+  * `const {token} = await loadFixture(standardTokenWithBalance);`
+* Customizable compilation options with native solc, dockerized solc and any version of solc-js loaded remotely at compiled time
+* Support for promise-based configuration, e.g.:
+  * use native solc binary for fast compilation in CI environment
+  * use solc-js based on contract versions detected (async)
+* Support for TypeScript
+* [Documentation](https://ethereum-waffle.readthedocs.io/en/latest/)
+
+## Documentation
+Documentation is available [here](https://ethereum-waffle.readthedocs.io/en/latest/).
+
+## Installation:
+
+To get started install `ethereum-waffle` with yarn:
+```
+yarn add --dev ethereum-waffle
+```
+
+Or if you prefer using npm:
+```
+npm install --save-dev ethereum-waffle
+```
+
+## Step by step guide
+
+### Add external dependency:
+To add an external library install it using npm:
+
+```sh
+npm i openzeppelin-solidity -D
+```
+
+or with yarn:
+
+```sh
+yarn add openzeppelin-solidity -D
+```
+
+### Example contract
+Below is an example contract written in Solidity. Place it in `contracts/BasicToken.sol` file of your project:
+
+```solidity
+// contracts/BasicToken.sol
+pragma solidity ^0.5.1;
+
+import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
+
+// Example class - a mock class using delivering from ERC20
+contract BasicToken is ERC20 {
+  constructor(address initialAccount, uint256 initialBalance) public {
+    super._mint(initialAccount, initialBalance);
+  }
+}
+```
+
+### Example test
+Below is an example test written for the contract above compiled with Waffle. Place it under `test/BasicToken.js` file of your project:
+
+```js
+// test/BasicToken.js
+const {use, expect} = require('chai');
+const {MockProvider, deployContract, solidity} = require('ethereum-waffle');
+const BasicToken = require('../build/BasicToken');
+
+use(solidity);
+
+describe('BasicToken', () => {
+  const [wallet, walletTo] = new MockProvider().getWallets();
+  let token;
+
+  beforeEach(async () => {
+    token = await deployContract(wallet, BasicTokenMock, [wallet.address, 1000]);
+  });
+
+  it('Assigns initial balance', async () => {
+    expect(await token.balanceOf(wallet.address)).to.equal(1000);
+  });
+
+  it('Transfer adds amount to destination account', async () => {
+    await token.transfer(walletTo.address, 7);
+    expect(await token.balanceOf(walletTo.address)).to.equal(7);
+  });
+
+  it('Transfer emits event', async () => {
+    await expect(token.transfer(walletTo.address, 7))
+      .to.emit(token, 'Transfer')
+      .withArgs(wallet.address, walletTo.address, 7);
+  });
+
+  it('Can not transfer above the amount', async () => {
+    await expect(token.transfer(walletTo.address, 1007)).to.be.reverted;
+  });
+
+  it('Can not transfer from empty account', async () => {
+    const tokenFromOtherWallet = token.connect(walletTo);
+    await expect(tokenFromOtherWallet.transfer(wallet.address, 1))
+      .to.be.reverted;
+  });
+});
+```
+
+Note: You will also need to install following dependencies with to run the example above:
+
+```sh
+yarn add mocha -D
+yarn add chai -D
+```
+
+Or with npm:
+
+```
+npm i chai -D
+npm i mocha -D
+```
+
+### Compiling
+To compile your smart contracts run:
+
+```sh
+npx waffle
+```
+
+To compile using a custom configuration file run:
+
+```sh
+npx waffle config.json
+```
+
+Example configuration file looks like this (all fields optional):
+```json
+{
+  "sourcesPath": "./custom_contracts",
+  "targetPath": "./custom_build",
+  "npmPath": "./custom_node_modules"
+}
+```
+
+### Running tests
+To run the tests run the following command:
+
+```sh
+npx mocha
+```
+
+### Adding an npm script
+For convinience, you can add the following to your `package.json`:
+```
+{
+  ...,
+  "scripts": {
+    "test": "waffle && mocha"
+  }
+}
+```
+
+Now you can build and test your contracts with one command:
+
+```sh
+npm test
+```
+
+## Documentation
+For detailed feature walkthrough checkout [documentation](https://ethereum-waffle.readthedocs.io/en/latest/).
+
+## Contributing
+
+Contributions are always welcome, no matter how large or small. Before contributing, please read the [code of conduct](https://github.com/EthWorks/Waffle/blob/master/CODE_OF_CONDUCT.md) and [contribution policy](https://github.com/EthWorks/Waffle/blob/master/CONTRIBUTION.md).
+
+Before you issue pull request:
+
+Make sure all tests and linters pass.
+Make sure you have test coverage for any new features.
+
+### Running tests
+Note: To make end-to-end test pass, you need to:
+* have Docker installed, up and running
+* have Ethereum stable docker image pulled, if not run `docker pull ethereum/solc:stable`
+* have native solidity 0.5.* installed
+
+To run tests type:
+```sh
+yarn test
+```
+
+To run linter type:
+```sh
+yarn lint
+```
+
+Building documentation (requires Sphinx):
+```sh
+cd docs
+make html
+```
+
+## Roadmap
+
+See https://github.com/EthWorks/Waffle/issues/155
+
+## License
+
+Waffle is released under the [MIT License](https://opensource.org/licenses/MIT).
diff --git a/waffle-cli/package.json b/waffle-cli/package.json
index 121cf2f85..ea1a64e12 100644
--- a/waffle-cli/package.json
+++ b/waffle-cli/package.json
@@ -1,11 +1,25 @@
 {
   "name": "ethereum-waffle",
   "description": "Sweeter, faster and simpler than truffle.",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": "Marek Kirejczyk <account@ethworks.io> (http://ethworks.io)",
   "repository": "git@github.com:EthWorks/Waffle.git",
   "private": false,
   "license": "MIT",
+  "keywords": [
+    "ethereum",
+    "smart-contracts",
+    "solidity",
+    "compiler",
+    "testing",
+    "javascript",
+    "typescript",
+    "library"
+  ],
+  "homepage": "https://github.com/EthWorks/Waffle",
+  "bugs": {
+    "url": "https://github.com/EthWorks/Waffle/issues"
+  },
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.ts",
   "types": "dist/esm/index.d.ts",
@@ -28,7 +42,7 @@
     "node": ">=10.0"
   },
   "dependencies": {
-    "@ethereum-waffle/provider": "^2.3.0",
+    "@ethereum-waffle/provider": "^2.3.1",
     "@ethereum-waffle/chai": "^2.3.0",
     "@ethereum-waffle/compiler": "^2.3.0",
     "ethers": "^4.0.0"