diff --git a/.gitattributes b/.gitattributes
index 094a0ff..a84d38d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,3 +23,9 @@ phpunit.xml.dist export-ignore
 .travis.yml export-ignore
 .codeclimate.yml export-ignore
 .styleci.yml export-ignore
+
+# Ignore Github files
+CODE_OF_CONDUCT.md export-ignore
+CONTRIBUTING.md export-ignore
+ISSUE_TEMPLATE.md export-ignore
+PULL_REQUEST_TEMPLATE.md export-ignore
diff --git a/.travis.yml b/.travis.yml
index 40af35e..c7f0baa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,11 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
+    - php: 7.1
       env:
         - EXECUTE_COVERAGE=true
-    - php: 7.1
+    - php: 7.2
+    - php: 7.3
 
 notifications:
   email: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37f5757..d76659d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,6 @@ $ phpunit
  * [PSR-1: Basic Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md)
  * [PSR-2: Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
  * [PSR-4: Autoloading Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md)
- * [PSR-5: PHPDoc (draft)](https://github.com/phpDocumentor/fig-standards/blob/master/proposed/phpdoc.md)
  * Keep the order of class elements: static properties, instance properties, constructor (or setUp for PHPUnit), destructor (or tearDown for PHPUnit), static methods, instance methods, magic static methods, magic instance methods.
 
 
diff --git a/README.md b/README.md
index 668ed97..ee01c7d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ because often the message and the code are not enough to debug.
 Using [Composer](https://getcomposer.org):
 
 ```bash
-composer require z-ee/exceptions
+composer require zeeproject/exceptions
 ```
 
 ## Usage
@@ -29,27 +29,18 @@ throw new InvalidArgumentException('Something went wrong', [
 ]);
 ~~~
 
-Now you can handle this exception, i.q. your error handler may log error details:
+Now you can handle this exception, e.q. your error handler may log error details:
 
 ~~~php
-class ErrorHandler
+final class ErrorHandler
 {
-    /**
-     * @var LoggerInterface
-     */
     private $logger;
 
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function __construct(LoggerInterface $logger)
+    public function __construct(Psr\Log\LoggerInterface $logger)
     {
         $this->logger = $logger;
     }
 
-    /**
-     * @param Exception $exception
-     */
     public function handleException(Exception $exception)
     {
         if ($exception instanceof Zee\Exceptions\Throwable) {
@@ -64,11 +55,6 @@ class ErrorHandler
 ## Testing
 
 ```bash
-# install required files
-composer self-update
-composer install
-
-# run the test (from project root)
 phpunit
 ```
 
@@ -83,15 +69,15 @@ Contributions are welcome and will be fully credited. Please see [CONTRIBUTING](
 
 ## License
 
-The BSD 2-Clause License. Please see [LICENSE][link-license] for more information.
+It's [BSD 2-Clause][link-license].
 
-[ico-version]: https://img.shields.io/packagist/v/z-ee/exceptions.svg?style=flat-square
+[ico-version]: https://img.shields.io/packagist/v/zeeproject/exceptions.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/License-BSD%202--Clause-blue.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/zee/exceptions/master.svg?style=flat-square
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/zee/exceptions.svg?style=flat-square
 [ico-code-quality]: https://img.shields.io/scrutinizer/g/zee/exceptions.svg?style=flat-square
 
-[link-packagist]: https://packagist.org/packages/z-ee/exceptions
+[link-packagist]: https://packagist.org/packages/zeeproject/exceptions
 [link-license]: LICENSE
 [link-travis]: https://travis-ci.org/zee/exceptions
 [link-scrutinizer]: https://scrutinizer-ci.com/g/zee/exceptions/code-structure
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/build/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/composer.json b/composer.json
index 0361267..6b73b8c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "z-ee/exceptions",
+  "name": "zeeproject/exceptions",
   "description": "Set of the base exceptions",
   "license": "BSD-2-Clause",
   "keywords": [
@@ -13,12 +13,11 @@
     }
   ],
   "require": {
-    "php": "^7.0",
-    "ext-json": "*"
+    "php": "^7.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0",
-    "scrutinizer/ocular": "~1.1"
+    "phpunit/phpunit": "^7.5",
+    "scrutinizer/ocular": "~1.5"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 541e9d0..2079816 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
          failOnRisky="true"
@@ -24,7 +24,6 @@
 
     <php>
         <ini name="error_reporting" value="-1" />
-
         <const name="PHPUNIT_TESTSUITE" value="true"/>
     </php>
 </phpunit>
diff --git a/src/BadFunctionCallException.php b/src/BadFunctionCallException.php
index 127b53f..d519e91 100644
--- a/src/BadFunctionCallException.php
+++ b/src/BadFunctionCallException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use BadFunctionCallException as BaseException;
-
-/**
- * Class BadFunctionCallException.
- */
-class BadFunctionCallException extends BaseException implements Throwable
+class BadFunctionCallException extends \BadFunctionCallException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/BadMethodCallException.php b/src/BadMethodCallException.php
index 0c7de08..7e4c00a 100644
--- a/src/BadMethodCallException.php
+++ b/src/BadMethodCallException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use BadMethodCallException as BaseException;
-
-/**
- * Class BadMethodCallException.
- */
-class BadMethodCallException extends BaseException implements Throwable
+class BadMethodCallException extends \BadMethodCallException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/DomainException.php b/src/DomainException.php
index 4b69d19..d64870b 100644
--- a/src/DomainException.php
+++ b/src/DomainException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use DomainException as BaseException;
-
-/**
- * Class DomainException.
- */
-class DomainException extends BaseException implements Throwable
+class DomainException extends \DomainException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/InvalidArgumentException.php b/src/InvalidArgumentException.php
index 434e6ff..16d23be 100644
--- a/src/InvalidArgumentException.php
+++ b/src/InvalidArgumentException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use InvalidArgumentException as BaseException;
-
-/**
- * Class InvalidArgumentException.
- */
-class InvalidArgumentException extends BaseException implements Throwable
+class InvalidArgumentException extends \InvalidArgumentException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/LengthException.php b/src/LengthException.php
index c2e8989..d657aa8 100644
--- a/src/LengthException.php
+++ b/src/LengthException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use LengthException as BaseException;
-
-/**
- * Class LengthException.
- */
-class LengthException extends BaseException implements Throwable
+class LengthException extends \LengthException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/LogicException.php b/src/LogicException.php
index 90abc4a..2f9aef9 100644
--- a/src/LogicException.php
+++ b/src/LogicException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use LogicException as BaseException;
-
-/**
- * Class LogicException.
- */
-class LogicException extends BaseException implements Throwable
+class LogicException extends \LogicException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/OutOfBoundsException.php b/src/OutOfBoundsException.php
index f801b2c..823aea5 100644
--- a/src/OutOfBoundsException.php
+++ b/src/OutOfBoundsException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use OutOfBoundsException as BaseException;
-
-/**
- * Class OutOfBoundsException.
- */
-class OutOfBoundsException extends BaseException implements Throwable
+class OutOfBoundsException extends \OutOfBoundsException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/OutOfRangeException.php b/src/OutOfRangeException.php
index 4a21cfe..980c2e3 100644
--- a/src/OutOfRangeException.php
+++ b/src/OutOfRangeException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use OutOfRangeException as BaseException;
-
-/**
- * Class OutOfRangeException.
- */
-class OutOfRangeException extends BaseException implements Throwable
+class OutOfRangeException extends \OutOfRangeException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/OverflowException.php b/src/OverflowException.php
index e71e6fc..2ba2af7 100644
--- a/src/OverflowException.php
+++ b/src/OverflowException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use OverflowException as BaseException;
-
-/**
- * Class OverflowException.
- */
-class OverflowException extends BaseException implements Throwable
+class OverflowException extends \OverflowException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/RangeException.php b/src/RangeException.php
index 61fe659..a60b3c7 100644
--- a/src/RangeException.php
+++ b/src/RangeException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use RangeException as BaseException;
-
-/**
- * Class RangeException.
- */
-class RangeException extends BaseException implements Throwable
+class RangeException extends \RangeException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/RuntimeException.php b/src/RuntimeException.php
index 37378f5..65496c0 100644
--- a/src/RuntimeException.php
+++ b/src/RuntimeException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use RuntimeException as BaseException;
-
-/**
- * Class RuntimeException.
- */
-class RuntimeException extends BaseException implements Throwable
+class RuntimeException extends \RuntimeException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/Throwable.php b/src/Throwable.php
index b1d8a9d..5f75c02 100644
--- a/src/Throwable.php
+++ b/src/Throwable.php
@@ -1,24 +1,14 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use Throwable as BaseThrowable;
-
 /**
  * Marker interface for exceptions with context information.
  */
-interface Throwable extends BaseThrowable
+interface Throwable extends \Throwable
 {
-    /**
-     * @return array
-     */
     public function getContext() : array;
 }
diff --git a/src/ThrowableContextTrait.php b/src/ThrowableContextTrait.php
index 11b6f0c..09970b7 100644
--- a/src/ThrowableContextTrait.php
+++ b/src/ThrowableContextTrait.php
@@ -1,31 +1,14 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-/**
- * Trait ThrowableContextTrait.
- */
 trait ThrowableContextTrait
 {
-    /**
-     * @var array
-     */
     private $context = [];
 
-    /**
-     * @param string $message
-     * @param array $context
-     * @param int $code
-     * @param Throwable|null $previous
-     */
     public function __construct(string $message = '', array $context = [], int $code = 0, Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
@@ -33,9 +16,6 @@ public function __construct(string $message = '', array $context = [], int $code
         $this->context = $context;
     }
 
-    /**
-     * @return array
-     */
     public function getContext() : array
     {
         return $this->context;
diff --git a/src/UnderflowException.php b/src/UnderflowException.php
index 1abc2a4..7fcb23f 100644
--- a/src/UnderflowException.php
+++ b/src/UnderflowException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use UnderflowException as BaseException;
-
-/**
- * Class UnderflowException.
- */
-class UnderflowException extends BaseException implements Throwable
+class UnderflowException extends \UnderflowException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/src/UnexpectedValueException.php b/src/UnexpectedValueException.php
index fe921e1..aeb6f5d 100644
--- a/src/UnexpectedValueException.php
+++ b/src/UnexpectedValueException.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions;
 
-use UnexpectedValueException as BaseException;
-
-/**
- * Class UnexpectedValueException.
- */
-class UnexpectedValueException extends BaseException implements Throwable
+class UnexpectedValueException extends \UnexpectedValueException implements Throwable
 {
     use ThrowableContextTrait;
 }
diff --git a/tests/ReadExceptionContextTest.php b/tests/ReadExceptionContextTest.php
index 5768d8f..4f80d12 100644
--- a/tests/ReadExceptionContextTest.php
+++ b/tests/ReadExceptionContextTest.php
@@ -1,11 +1,6 @@
 <?php
 /**
- * This file is part of Zee Project.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @see https://github.com/zee/
+ * {@see https://github.com/zee/ Zee Project (c)}
  */
 
 namespace Zee\Exceptions\Tests;
@@ -13,25 +8,20 @@
 use PHPUnit\Framework\TestCase;
 use Zee\Exceptions;
 
-/**
- * Class ReadExceptionContextTest.
- */
 class ReadExceptionContextTest extends TestCase
 {
     /**
      * @test
      * @dataProvider provideExceptionClasses
-     *
-     * @param string $exceptionClass
      */
-    public function exceptionObjectShouldContainContext(string $exceptionClass)
+    public function exceptionObjectShouldContainContext(string $exceptionClass): void
     {
         $message = 'Something went wrong';
         $code = PHP_INT_MAX;
         $context = ['foo' => 'bar'];
-        
+
         $exception = new $exceptionClass($message, $context, $code);
-        
+
         if ($exception instanceof Exceptions\Throwable) {
             self::assertSame($message, $exception->getMessage());
             self::assertSame($context, $exception->getContext());
@@ -41,7 +31,7 @@ public function exceptionObjectShouldContainContext(string $exceptionClass)
         }
     }
 
-    public function provideExceptionClasses()
+    public function provideExceptionClasses(): array
     {
         return [
             [Exceptions\LogicException::class],