diff --git a/composer.json b/composer.json
index 0f58654..a5f8aea 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "fenom/fenom",
     "type": "library",
     "description": "Fenom - excellent template engine for PHP",
-    "keywords": ["fenom", "template", "templating", "templater"],
+    "keywords": ["fenom", "template", "templating", "templater", "php"],
     "license": "BSD-3",
     "authors": [
         {
@@ -11,15 +11,20 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4",
         "ext-tokenizer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "<6.0",
+        "phpunit/phpunit": ">=6.0",
         "satooshi/php-coveralls": "*"
     },
     "autoload": {
-        "psr-0": { "Fenom\\": "src/" },
-        "classmap": [ "src/Fenom.php" ]
+        "psr-4": {
+            "Fenom\\": "src/Fenom/"
+        },
+        "psr-0": {
+            "Fenom": "src/"
+        },
+        "classmap": ["src/"]
     }
 }