diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index 5403077..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-spl_autoload_register(function ($class) {
-      require_once str_replace('\\', '/', $class). '.php'; 
-      });
diff --git a/composer.json b/composer.json
index bdbe1c2..af2aa8b 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,8 @@
     "homepage": "http://cleantalk.org",
     "keywords": ["spam", "anti-spam", "antispam", "api"],
     "autoload": {
-        "classmap": ["lib/Cleantalk.php", "lib/CleantalkRequest.php", "lib/CleantalkResponse.php", "lib/CleantalkAPI.php", "lib/CleantalkHelper.php"]
+        "psr-4": {
+            "lib\\": "lib"
+        }
     }
 }