diff --git a/composer.json b/composer.json
index 0a9b282..44f7a82 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\Contributte\\Utils\\": "tests/cases/Unit"
+      "Tests\\": "tests"
     }
   },
   "minimum-stability": "dev",
diff --git a/tests/cases/Unit/Arrays.phpt b/tests/Cases/Arrays.phpt
similarity index 91%
rename from tests/cases/Unit/Arrays.phpt
rename to tests/Cases/Arrays.phpt
index 6d4c0cb..f7615c3 100644
--- a/tests/cases/Unit/Arrays.phpt
+++ b/tests/Cases/Arrays.phpt
@@ -3,7 +3,7 @@
 use Contributte\Utils\Arrays;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 test(function (): void {
 	$array1 = ['a', 'b', 'c', 'd'];
diff --git a/tests/cases/Unit/Config.phpt b/tests/Cases/Config.phpt
similarity index 94%
rename from tests/cases/Unit/Config.phpt
rename to tests/Cases/Config.phpt
index 34bad26..a908fc1 100644
--- a/tests/cases/Unit/Config.phpt
+++ b/tests/Cases/Config.phpt
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Config;
 use Tester\Assert;
diff --git a/tests/cases/Unit/Csv.phpt b/tests/Cases/Csv.phpt
similarity index 85%
rename from tests/cases/Unit/Csv.phpt
rename to tests/Cases/Csv.phpt
index eb65a42..ce11ef8 100644
--- a/tests/cases/Unit/Csv.phpt
+++ b/tests/Cases/Csv.phpt
@@ -4,7 +4,7 @@
  * Test: Csv
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Csv;
 use Nette\InvalidStateException;
@@ -33,7 +33,7 @@ test(function (): void {
 		2 => 'city',
 		3 => 'id',
 		4 => 'x',
-	], __DIR__ . '/../../fixtures/sample.csv'));
+	], __DIR__ . '/../Fixtures/sample.csv'));
 });
 
 // Complex array matching
@@ -67,7 +67,7 @@ test(function (): void {
 		2 => 'city',
 		3 => 'extra.id',
 		4 => 'extra.x',
-	], __DIR__ . '/../../fixtures/sample.csv'));
+	], __DIR__ . '/../Fixtures/sample.csv'));
 });
 
 // Part of simple array matching
@@ -81,7 +81,7 @@ test(function (): void {
 		],
 	], Csv::structural([
 		4 => 'x',
-	], __DIR__ . '/../../fixtures/sample.csv'));
+	], __DIR__ . '/../Fixtures/sample.csv'));
 });
 
 // Part of complex array matching
@@ -103,7 +103,7 @@ test(function (): void {
 		],
 	], Csv::structural([
 		4 => 'x.y.z',
-	], __DIR__ . '/../../fixtures/sample.csv'));
+	], __DIR__ . '/../Fixtures/sample.csv'));
 });
 
 // Overriding
@@ -118,7 +118,7 @@ test(function (): void {
 	], Csv::structural([
 		2 => 'x',
 		4 => 'x',
-	], __DIR__ . '/../../fixtures/sample.csv'));
+	], __DIR__ . '/../Fixtures/sample.csv'));
 });
 
 // Invalid arguments
@@ -132,6 +132,6 @@ test(function (): void {
 			4 => 'e',
 			5 => 'f',
 			6 => 'g',
-		], __DIR__ . '/../../fixtures/sample.csv');
+		], __DIR__ . '/../Fixtures/sample.csv');
 	}, InvalidStateException::class);
 });
diff --git a/tests/cases/Unit/DI/DateTimeFactoryExtensions.phpt b/tests/Cases/DI/DateTimeFactoryExtensions.phpt
similarity index 92%
rename from tests/cases/Unit/DI/DateTimeFactoryExtensions.phpt
rename to tests/Cases/DI/DateTimeFactoryExtensions.phpt
index e39b4b3..6dce2a9 100644
--- a/tests/cases/Unit/DI/DateTimeFactoryExtensions.phpt
+++ b/tests/Cases/DI/DateTimeFactoryExtensions.phpt
@@ -11,7 +11,7 @@ use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../bootstrap.php';
 
 test(function (): void {
 	$loader = new ContainerLoader(TEMP_DIR, true);
diff --git a/tests/cases/Unit/DateTime.compare.phpt b/tests/Cases/DateTime.compare.phpt
similarity index 96%
rename from tests/cases/Unit/DateTime.compare.phpt
rename to tests/Cases/DateTime.compare.phpt
index eb93588..150eab2 100644
--- a/tests/cases/Unit/DateTime.compare.phpt
+++ b/tests/Cases/DateTime.compare.phpt
@@ -4,7 +4,7 @@
  * Test: DateTime [comparing]
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\DateTime;
 use Tester\Assert;
diff --git a/tests/cases/Unit/DateTime.phpt b/tests/Cases/DateTime.phpt
similarity index 98%
rename from tests/cases/Unit/DateTime.phpt
rename to tests/Cases/DateTime.phpt
index b64d775..f219ce4 100644
--- a/tests/cases/Unit/DateTime.phpt
+++ b/tests/Cases/DateTime.phpt
@@ -4,7 +4,7 @@
  * Test: DateTime
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\DateTime;
 use Tester\Assert;
diff --git a/tests/cases/Unit/DeeperTest.phpt b/tests/Cases/DeeperTest.php
similarity index 93%
rename from tests/cases/Unit/DeeperTest.phpt
rename to tests/Cases/DeeperTest.php
index 8984789..9e0257c 100644
--- a/tests/cases/Unit/DeeperTest.phpt
+++ b/tests/Cases/DeeperTest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Contributte\Utils\Unit;
+namespace Tests\Cases;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Deeper;
 use Nette\InvalidArgumentException;
diff --git a/tests/cases/Unit/Fields.phpt b/tests/Cases/Fields.phpt
similarity index 97%
rename from tests/cases/Unit/Fields.phpt
rename to tests/Cases/Fields.phpt
index 6d6d150..dd560da 100644
--- a/tests/cases/Unit/Fields.phpt
+++ b/tests/Cases/Fields.phpt
@@ -4,7 +4,7 @@
  * Test: Fields
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Fields;
 use Tester\Assert;
diff --git a/tests/cases/Unit/Http.phpt b/tests/Cases/Http.phpt
similarity index 93%
rename from tests/cases/Unit/Http.phpt
rename to tests/Cases/Http.phpt
index d707b57..79e89e1 100644
--- a/tests/cases/Unit/Http.phpt
+++ b/tests/Cases/Http.phpt
@@ -4,7 +4,7 @@
  * Test: Http
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Http;
 use Tester\Assert;
diff --git a/tests/cases/Unit/LazyCollection.phpt b/tests/Cases/LazyCollection.phpt
similarity index 88%
rename from tests/cases/Unit/LazyCollection.phpt
rename to tests/Cases/LazyCollection.phpt
index 490335e..cdf18c6 100644
--- a/tests/cases/Unit/LazyCollection.phpt
+++ b/tests/Cases/LazyCollection.phpt
@@ -3,7 +3,7 @@
 use Contributte\Utils\LazyCollection;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 test(function (): void {
 	$data = ['foo', 'bar', 'baz'];
diff --git a/tests/cases/Unit/Merger.phpt b/tests/Cases/Merger.phpt
similarity index 97%
rename from tests/cases/Unit/Merger.phpt
rename to tests/Cases/Merger.phpt
index a6f5aeb..7dd56dc 100644
--- a/tests/cases/Unit/Merger.phpt
+++ b/tests/Cases/Merger.phpt
@@ -3,7 +3,7 @@
 use Contributte\Utils\Merger;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 test(function (): void {
 	$right = [
diff --git a/tests/cases/Unit/Monad/OptionalTest.phpt b/tests/Cases/Monad/OptionalTest.php
similarity index 91%
rename from tests/cases/Unit/Monad/OptionalTest.phpt
rename to tests/Cases/Monad/OptionalTest.php
index 51c5066..b5ab778 100644
--- a/tests/cases/Unit/Monad/OptionalTest.phpt
+++ b/tests/Cases/Monad/OptionalTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Contributte\Utils\Unit\Monad;
+namespace Tests\Cases\Monad;
 
 use Contributte\Utils\Monad\Optional;
 use Exception;
@@ -9,7 +9,7 @@
 use Tester\TestCase;
 use Throwable;
 
-require_once __DIR__ . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../bootstrap.php';
 
 class OptionalTest extends TestCase
 {
diff --git a/tests/cases/Unit/Strings.phpt b/tests/Cases/Strings.phpt
similarity index 98%
rename from tests/cases/Unit/Strings.phpt
rename to tests/Cases/Strings.phpt
index 2e0a8d2..e11061a 100644
--- a/tests/cases/Unit/Strings.phpt
+++ b/tests/Cases/Strings.phpt
@@ -4,7 +4,7 @@
  * Test: Strings
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Strings;
 use Tester\Assert;
diff --git a/tests/cases/Unit/Urls.phpt b/tests/Cases/Urls.phpt
similarity index 87%
rename from tests/cases/Unit/Urls.phpt
rename to tests/Cases/Urls.phpt
index 119b25e..04bbd7d 100644
--- a/tests/cases/Unit/Urls.phpt
+++ b/tests/Cases/Urls.phpt
@@ -3,7 +3,7 @@
 use Contributte\Utils\Urls;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 // Urls::spaceless
 test(function (): void {
diff --git a/tests/cases/Unit/Validators.phpt b/tests/Cases/Validators.phpt
similarity index 96%
rename from tests/cases/Unit/Validators.phpt
rename to tests/Cases/Validators.phpt
index e5cd834..5e0532c 100644
--- a/tests/cases/Unit/Validators.phpt
+++ b/tests/Cases/Validators.phpt
@@ -4,7 +4,7 @@
  * Test: Validators
  */
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 use Contributte\Utils\Validators;
 use Tester\Assert;
diff --git a/tests/cases/Unit/Values/Email.phpt b/tests/Cases/Values/Email.phpt
similarity index 87%
rename from tests/cases/Unit/Values/Email.phpt
rename to tests/Cases/Values/Email.phpt
index 326b9ce..5ca8f82 100644
--- a/tests/cases/Unit/Values/Email.phpt
+++ b/tests/Cases/Values/Email.phpt
@@ -7,7 +7,7 @@
 use Contributte\Utils\Values\Email;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../../bootstrap.php';
+require_once __DIR__ . '/../../bootstrap.php';
 
 test(function (): void {
 	$email = new Email('foo@bar.baz');
diff --git a/tests/fixtures/sample.csv b/tests/Fixtures/sample.csv
similarity index 100%
rename from tests/fixtures/sample.csv
rename to tests/Fixtures/sample.csv