diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..aa6c312
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+/.gitattributes export-ignore
+/.github/ export-ignore
+/.gitignore export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore
diff --git a/LICENSE b/LICENSE
index 3db24de..44acaef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Igor Wiedler
+Copyright (c) 2012 Christian Lück, Cees-Jan Kiewiet, Jan Sorgalla, Chris Boden, Igor Wiedler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 1e46bd9..d23bcc2 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # NOTE: This package is no longer maintained. Use [react/promise](https://github.com/reactphp/promise) instead!
 
-# React/Async
+# Async
 
-Async utilities for React.
+Async utilities for [ReactPHP](https://reactphp.org/).
 
 It is heavily influenced by [async.js](https://github.com/caolan/async).
 
@@ -133,4 +133,4 @@ $ php vendor/bin/phpunit
 
 ## License
 
-MIT, see LICENSE.
+MIT, see [LICENSE file](LICENSE).
diff --git a/composer.json b/composer.json
index 3977ee7..3e1ea58 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,30 @@
 {
     "name": "react/async",
-    "description": "Async utilities for React.",
-    "keywords": ["async"],
+    "description": "Async utilities for ReactPHP",
+    "keywords": ["async", "ReactPHP"],
     "license": "MIT",
+    "authors": [
+        {
+            "name": "Christian Lück",
+            "homepage": "https://clue.engineering/",
+            "email": "christian@clue.engineering"
+        },
+        {
+            "name": "Cees-Jan Kiewiet",
+            "homepage": "https://wyrihaximus.net/",
+            "email": "reactphp@ceesjankiewiet.nl"
+        },
+        {
+            "name": "Jan Sorgalla",
+            "homepage": "https://sorgalla.com/",
+            "email": "jsorgalla@gmail.com"
+        },
+        {
+            "name": "Chris Boden",
+            "homepage": "https://cboden.dev/",
+            "email": "cboden@gmail.com"
+        }
+    ],
     "require": {
         "php": ">=5.3.2"
     },
@@ -14,7 +36,10 @@
         "react/event-loop": "You need some kind of event loop for this to make sense."
     },
     "autoload": {
-        "psr-0": { "React\\Async": "src" }
+        "psr-4": { "React\\Async\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Async\\": "tests/" }
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6593f58..49eb132 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,11 +9,11 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="React-Async Test Suite">
-            <directory>./tests/React/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
diff --git a/src/React/Async/Util.php b/src/Util.php
similarity index 100%
rename from src/React/Async/Util.php
rename to src/Util.php
diff --git a/tests/React/Tests/Async/TestCase.php b/tests/TestCase.php
similarity index 100%
rename from tests/React/Tests/Async/TestCase.php
rename to tests/TestCase.php
diff --git a/tests/React/Tests/Async/Timer.php b/tests/Timer.php
similarity index 100%
rename from tests/React/Tests/Async/Timer.php
rename to tests/Timer.php
diff --git a/tests/React/Tests/Async/UtilParallelTest.php b/tests/UtilParallelTest.php
similarity index 100%
rename from tests/React/Tests/Async/UtilParallelTest.php
rename to tests/UtilParallelTest.php
diff --git a/tests/React/Tests/Async/UtilSeriesTest.php b/tests/UtilSeriesTest.php
similarity index 100%
rename from tests/React/Tests/Async/UtilSeriesTest.php
rename to tests/UtilSeriesTest.php
diff --git a/tests/React/Tests/Async/UtilWaterfallTest.php b/tests/UtilWaterfallTest.php
similarity index 100%
rename from tests/React/Tests/Async/UtilWaterfallTest.php
rename to tests/UtilWaterfallTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 7e26233..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$loader = require __DIR__.'/../vendor/autoload.php';
-$loader->add('React\Tests', __DIR__);