diff --git a/composer.json b/composer.json
index 7f1b3f5..aca4494 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,13 @@
         "hidden",
         "masked",
         "sensitive",
-        "password"
+        "password",
+        "authenticator",
+        "authy",
+        "totp",
+        "hotp",
+        "rfc4226",
+        "rfc6238"
     ],
     "license": "MIT",
     "authors": [
@@ -32,13 +38,18 @@
     },
     "autoload": {
         "psr-4": {
-            "Firehed\\Security\\": ["src/", "tests/"]
+            "Firehed\\Security\\": "src/"
         },
         "files": [
             "src/HOTP.php",
             "src/TOTP.php"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Firehed\\Security\\": "tests/"
+        }
+    },
     "scripts": {
         "test": [
             "@phpunit",