diff --git a/RoboFile.php b/RoboFile.php
index 0167bee..0e69581 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -143,7 +143,7 @@ protected function getTaskPhpcsLint()
 
         $files = [
             'src/',
-            'src-dev/',
+            'tests/',
             'RoboFile.php',
         ];
 
diff --git a/composer.json b/composer.json
index 1a576d7..8b362a9 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "GatherContent\\Composer\\": "src-dev/Composer",
-            "GatherContent\\Tests\\": "src-dev/Tests"
+            "GatherContent\\Tests\\": "tests/"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 848b9f9..f6dd7ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "403d716e06529a6d2518d0a58a34610d",
+    "content-hash": "61f5617c8ded245c8e967b67abdf64fe",
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
@@ -612,30 +612,30 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpbench/phpbench": "^0.16 || ^1",
                 "phpstan/phpstan": "^1.4",
                 "phpstan/phpstan-phpunit": "^1",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -662,7 +662,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -678,7 +678,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -741,16 +741,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                 "shasum": ""
             },
             "require": {
@@ -791,9 +791,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
             },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -908,16 +908,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.19",
+            "version": "9.2.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                 "shasum": ""
             },
             "require": {
@@ -973,7 +973,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
             },
             "funding": [
                 {
@@ -981,7 +981,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-11-18T07:47:47+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1226,20 +1226,20 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.26",
+            "version": "9.5.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -1308,7 +1308,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
             },
             "funding": [
                 {
@@ -1324,7 +1324,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-28T06:00:21+00:00"
+            "time": "2023-01-14T12:32:24+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2511,7 +2511,9 @@
     "stability-flags": [],
     "prefer-stable": true,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": ">=7.4"
+    },
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.4.0"
diff --git a/phpcs.xml b/phpcs.xml
index 146f24e..7cfbf23 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="PSR2Custom">
     <file>src/</file>
-    <file>src-dev/</file>
+    <file>tests/</file>
     <file>RoboFile.php</file>
 
     <arg
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5fae86b..7cd617a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
   </coverage>
   <testsuites>
     <testsuite name="Unit">
-      <directory>src-dev/Tests/Unit</directory>
+      <directory>tests/Unit</directory>
     </testsuite>
   </testsuites>
   <logging>
diff --git a/src-dev/Tests/Unit/DataTypes/AccountTest.php b/tests/Unit/DataTypes/AccountTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/AccountTest.php
rename to tests/Unit/DataTypes/AccountTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/AnnouncementTest.php b/tests/Unit/DataTypes/AnnouncementTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/AnnouncementTest.php
rename to tests/Unit/DataTypes/AnnouncementTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/BaseTest.php b/tests/Unit/DataTypes/BaseTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/BaseTest.php
rename to tests/Unit/DataTypes/BaseTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementBaseTest.php b/tests/Unit/DataTypes/ElementBaseTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementBaseTest.php
rename to tests/Unit/DataTypes/ElementBaseTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementChoiceTest.php b/tests/Unit/DataTypes/ElementChoiceTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementChoiceTest.php
rename to tests/Unit/DataTypes/ElementChoiceTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementFilesTest.php b/tests/Unit/DataTypes/ElementFilesTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementFilesTest.php
rename to tests/Unit/DataTypes/ElementFilesTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementGuidelineTest.php b/tests/Unit/DataTypes/ElementGuidelineTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementGuidelineTest.php
rename to tests/Unit/DataTypes/ElementGuidelineTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementSimpleChoiceTest.php b/tests/Unit/DataTypes/ElementSimpleChoiceTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementSimpleChoiceTest.php
rename to tests/Unit/DataTypes/ElementSimpleChoiceTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementSimpleFileTest.php b/tests/Unit/DataTypes/ElementSimpleFileTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementSimpleFileTest.php
rename to tests/Unit/DataTypes/ElementSimpleFileTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementSimpleTextTest.php b/tests/Unit/DataTypes/ElementSimpleTextTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementSimpleTextTest.php
rename to tests/Unit/DataTypes/ElementSimpleTextTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ElementTextTest.php b/tests/Unit/DataTypes/ElementTextTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ElementTextTest.php
rename to tests/Unit/DataTypes/ElementTextTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/FolderTest.php b/tests/Unit/DataTypes/FolderTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/FolderTest.php
rename to tests/Unit/DataTypes/FolderTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/GroupTest.php b/tests/Unit/DataTypes/GroupTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/GroupTest.php
rename to tests/Unit/DataTypes/GroupTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ItemTest.php b/tests/Unit/DataTypes/ItemTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ItemTest.php
rename to tests/Unit/DataTypes/ItemTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/PaginationTest.php b/tests/Unit/DataTypes/PaginationTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/PaginationTest.php
rename to tests/Unit/DataTypes/PaginationTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/ProjectTest.php b/tests/Unit/DataTypes/ProjectTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/ProjectTest.php
rename to tests/Unit/DataTypes/ProjectTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/StatusTest.php b/tests/Unit/DataTypes/StatusTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/StatusTest.php
rename to tests/Unit/DataTypes/StatusTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/StructureTest.php b/tests/Unit/DataTypes/StructureTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/StructureTest.php
rename to tests/Unit/DataTypes/StructureTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/TemplateTest.php b/tests/Unit/DataTypes/TemplateTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/TemplateTest.php
rename to tests/Unit/DataTypes/TemplateTest.php
diff --git a/src-dev/Tests/Unit/DataTypes/UserTest.php b/tests/Unit/DataTypes/UserTest.php
similarity index 100%
rename from src-dev/Tests/Unit/DataTypes/UserTest.php
rename to tests/Unit/DataTypes/UserTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientAccountTest.php b/tests/Unit/GatherContentClientAccountTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientAccountTest.php
rename to tests/Unit/GatherContentClientAccountTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientFolderTest.php b/tests/Unit/GatherContentClientFolderTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientFolderTest.php
rename to tests/Unit/GatherContentClientFolderTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientItemTest.php b/tests/Unit/GatherContentClientItemTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientItemTest.php
rename to tests/Unit/GatherContentClientItemTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientProjectTest.php b/tests/Unit/GatherContentClientProjectTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientProjectTest.php
rename to tests/Unit/GatherContentClientProjectTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientStructureTest.php b/tests/Unit/GatherContentClientStructureTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientStructureTest.php
rename to tests/Unit/GatherContentClientStructureTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientTemplateTest.php b/tests/Unit/GatherContentClientTemplateTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientTemplateTest.php
rename to tests/Unit/GatherContentClientTemplateTest.php
diff --git a/src-dev/Tests/Unit/GatherContentClientTest.php b/tests/Unit/GatherContentClientTest.php
similarity index 100%
rename from src-dev/Tests/Unit/GatherContentClientTest.php
rename to tests/Unit/GatherContentClientTest.php
diff --git a/src-dev/Tests/Unit/GcBaseTestCase.php b/tests/Unit/GcBaseTestCase.php
similarity index 100%
rename from src-dev/Tests/Unit/GcBaseTestCase.php
rename to tests/Unit/GcBaseTestCase.php
diff --git a/src-dev/Tests/Unit/Utils/NestedArrayTest.php b/tests/Unit/Utils/NestedArrayTest.php
similarity index 100%
rename from src-dev/Tests/Unit/Utils/NestedArrayTest.php
rename to tests/Unit/Utils/NestedArrayTest.php
diff --git a/src-dev/Tests/Unit/files/test.txt b/tests/Unit/files/test.txt
similarity index 100%
rename from src-dev/Tests/Unit/files/test.txt
rename to tests/Unit/files/test.txt