diff --git a/.State b/.State
deleted file mode 100644
index a604de4..0000000
--- a/.State
+++ /dev/null
@@ -1 +0,0 @@
-finalized
diff --git a/Exception.php b/Source/Exception.php
similarity index 95%
rename from Exception.php
rename to Source/Exception.php
index c838aab..b70671b 100644
--- a/Exception.php
+++ b/Source/Exception.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Hoa
  *
@@ -42,9 +44,6 @@
  * Class \Hoa\Zombie\Exception.
  *
  * Extending the \Hoa\Exception\Exception class.
- *
- * @copyright  Copyright © 2007-2017 Hoa community
- * @license    New BSD License
  */
 class Exception extends HoaException
 {
diff --git a/Zombie.php b/Source/Zombie.php
similarity index 86%
rename from Zombie.php
rename to Source/Zombie.php
index 3aa105d..7cc637c 100644
--- a/Zombie.php
+++ b/Source/Zombie.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Hoa
  *
@@ -42,28 +44,21 @@
  * Class \Hoa\Zombie.
  *
  * Zombie!
- *
- * @copyright  Copyright © 2007-2017 Hoa community
- * @license    New BSD License
  */
 class Zombie
 {
     /**
      * Test if we can start a zombie.
-     *
-     * @return  bool
      */
-    public static function test()
+    public static function test(): bool
     {
         return true === function_exists('fastcgi_finish_request');
     }
 
     /**
      * Try to create a zombie.
-     *
-     * @return  bool
      */
-    public static function fork()
+    public static function fork(): bool
     {
         if (true !== static::test()) {
             throw new Exception(
@@ -77,8 +72,6 @@ public static function fork()
 
     /**
      * Oh, why not decapitate?
-     *
-     * @return  void
      */
     public static function decapitate()
     {
@@ -89,8 +82,6 @@ public static function decapitate()
 
     /**
      * Maybe, we can bludgeon the zombie?
-     *
-     * @return  void
      */
     public static function bludgeon()
     {
@@ -101,8 +92,6 @@ public static function bludgeon()
 
     /**
      * Grilled zombies, hummm!
-     *
-     * @return  void
      */
     public static function burn()
     {
@@ -113,8 +102,6 @@ public static function burn()
 
     /**
      * One… two… three… … splash!
-     *
-     * @return  void
      */
     public static function explode()
     {
@@ -125,8 +112,6 @@ public static function explode()
 
     /**
      * Would like a slice?
-     *
-     * @return  void
      */
     public static function cutOff()
     {
@@ -137,8 +122,6 @@ public static function cutOff()
 
     /**
      * Whatever, really kill the zombie.
-     *
-     * @return  void
      */
     protected static function _kill()
     {
@@ -147,10 +130,8 @@ protected static function _kill()
 
     /**
      * Get PHP's process ID.
-     *
-     * @return  int
      */
-    public static function getPid()
+    public static function getPid(): int
     {
         return getmypid();
     }
@@ -159,4 +140,4 @@ public static function getPid()
 /**
  * Flex entity.
  */
-Consistency::flexEntity('Hoa\Zombie\Zombie');
+Consistency::flexEntity(Zombie::class);
diff --git a/Test/Unit/Zombie.php b/Test/Unit/Zombie.php
index 597e7c4..e6be789 100644
--- a/Test/Unit/Zombie.php
+++ b/Test/Unit/Zombie.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Hoa
  *
@@ -43,9 +45,6 @@
  * Class \Hoa\Zombie\Test\Unit\Documentation.
  *
  * Test suite of the zombie class.
- *
- * @copyright  Copyright © 2007-2017 Hoa community
- * @license    New BSD License
  */
 class Zombie extends Test\Unit\Suite
 {
diff --git a/composer.json b/composer.json
index fc6225b..5af3257 100644
--- a/composer.json
+++ b/composer.json
@@ -23,16 +23,17 @@
         "source": "https://central.hoa-project.net/Resource/Library/Zombie"
     },
     "require": {
-        "php"            : ">=5.5.0",
-        "hoa/consistency": "~1.0",
-        "hoa/exception"  : "~1.0"
+        "php"            : ">=7.1",
+        "hoa/consistency": "dev-master",
+        "hoa/exception"  : "dev-master"
     },
     "require-dev": {
-        "hoa/test": "~2.0"
+        "hoa/test": "dev-master"
     },
     "autoload": {
         "psr-4": {
-            "Hoa\\Zombie\\": "."
+            "Hoa\\Zombie\\"      : "Source",
+            "Hoa\\Zombie\\Test\\": "Test"
         }
     },
     "extra": {