diff --git a/src/Controller/GraphController.php b/src/Controller/GraphController.php
index d9f15f6..ccb1786 100644
--- a/src/Controller/GraphController.php
+++ b/src/Controller/GraphController.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\Service\ContributionAggregator;
-use App\Service\ProviderHealthChecker;
-use App\Service\SvgRenderer;
+use App\Service\Provider\ProviderHealthChecker;
+use App\Service\Renderer\SvgRenderer;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RedirectResponse;
diff --git a/src/Service/ContributionAggregator.php b/src/Service/ContributionAggregator.php
index 370d05f..24d37cb 100644
--- a/src/Service/ContributionAggregator.php
+++ b/src/Service/ContributionAggregator.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
+use App\Service\Provider\ProviderInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
 
diff --git a/src/Service/GitHubProvider.php b/src/Service/Provider/GitHubProvider.php
similarity index 99%
rename from src/Service/GitHubProvider.php
rename to src/Service/Provider/GitHubProvider.php
index 49bf749..55f71a3 100644
--- a/src/Service/GitHubProvider.php
+++ b/src/Service/Provider/GitHubProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 use IDCI\Bundle\GraphQLClientBundle\Client\GraphQLApiClient;
 use IDCI\Bundle\GraphQLClientBundle\Client\GraphQLApiClientRegistryInterface;
diff --git a/src/Service/GitLabProvider.php b/src/Service/Provider/GitLabProvider.php
similarity index 98%
rename from src/Service/GitLabProvider.php
rename to src/Service/Provider/GitLabProvider.php
index d903730..cc03990 100644
--- a/src/Service/GitLabProvider.php
+++ b/src/Service/Provider/GitLabProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/src/Service/GiteaProvider.php b/src/Service/Provider/GiteaProvider.php
similarity index 98%
rename from src/Service/GiteaProvider.php
rename to src/Service/Provider/GiteaProvider.php
index e3b75b1..411093d 100644
--- a/src/Service/GiteaProvider.php
+++ b/src/Service/Provider/GiteaProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
diff --git a/src/Service/ProbeTrait.php b/src/Service/Provider/ProbeTrait.php
similarity index 98%
rename from src/Service/ProbeTrait.php
rename to src/Service/Provider/ProbeTrait.php
index af86c33..714f7fc 100644
--- a/src/Service/ProbeTrait.php
+++ b/src/Service/Provider/ProbeTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
diff --git a/src/Service/ProviderErrorCode.php b/src/Service/Provider/ProviderErrorCode.php
similarity index 88%
rename from src/Service/ProviderErrorCode.php
rename to src/Service/Provider/ProviderErrorCode.php
index d9c484c..5574291 100644
--- a/src/Service/ProviderErrorCode.php
+++ b/src/Service/Provider/ProviderErrorCode.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 enum ProviderErrorCode: string
 {
diff --git a/src/Service/ProviderHealthChecker.php b/src/Service/Provider/ProviderHealthChecker.php
similarity index 96%
rename from src/Service/ProviderHealthChecker.php
rename to src/Service/Provider/ProviderHealthChecker.php
index 8ffe9a0..29d5400 100644
--- a/src/Service/ProviderHealthChecker.php
+++ b/src/Service/Provider/ProviderHealthChecker.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
 
diff --git a/src/Service/ProviderInterface.php b/src/Service/Provider/ProviderInterface.php
similarity index 91%
rename from src/Service/ProviderInterface.php
rename to src/Service/Provider/ProviderInterface.php
index c2ac9ad..015b559 100644
--- a/src/Service/ProviderInterface.php
+++ b/src/Service/Provider/ProviderInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 interface ProviderInterface
 {
diff --git a/src/Service/ProviderStatus.php b/src/Service/Provider/ProviderStatus.php
similarity index 95%
rename from src/Service/ProviderStatus.php
rename to src/Service/Provider/ProviderStatus.php
index 0483afa..f015c41 100644
--- a/src/Service/ProviderStatus.php
+++ b/src/Service/Provider/ProviderStatus.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 final class ProviderStatus
 {
diff --git a/src/Service/ProviderStatusType.php b/src/Service/Provider/ProviderStatusType.php
similarity index 84%
rename from src/Service/ProviderStatusType.php
rename to src/Service/Provider/ProviderStatusType.php
index 29031e1..96e0608 100644
--- a/src/Service/ProviderStatusType.php
+++ b/src/Service/Provider/ProviderStatusType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Provider;
 
 enum ProviderStatusType: string
 {
diff --git a/src/Service/SvgRenderer.php b/src/Service/Renderer/SvgRenderer.php
similarity index 99%
rename from src/Service/SvgRenderer.php
rename to src/Service/Renderer/SvgRenderer.php
index 00ee8d3..64db26b 100644
--- a/src/Service/SvgRenderer.php
+++ b/src/Service/Renderer/SvgRenderer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Service;
+namespace App\Service\Renderer;
 
 /**
  * Renders a GitHub-style contribution heatmap as an inline SVG.
diff --git a/tests/Unit/Service/ContributionAggregatorTest.php b/tests/Unit/Service/ContributionAggregatorTest.php
index 95f1d8f..b280626 100644
--- a/tests/Unit/Service/ContributionAggregatorTest.php
+++ b/tests/Unit/Service/ContributionAggregatorTest.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Tests\Unit\Service;
 
 use App\Service\ContributionAggregator;
-use App\Service\ProviderInterface;
+use App\Service\Provider\ProviderInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/GitHubProviderTest.php b/tests/Unit/Service/Provider/GitHubProviderTest.php
similarity index 98%
rename from tests/Unit/Service/GitHubProviderTest.php
rename to tests/Unit/Service/Provider/GitHubProviderTest.php
index daeace5..1e8b9f4 100644
--- a/tests/Unit/Service/GitHubProviderTest.php
+++ b/tests/Unit/Service/Provider/GitHubProviderTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\GitHubProvider;
+use App\Service\Provider\GitHubProvider;
 use IDCI\Bundle\GraphQLClientBundle\Client\GraphQLApiClient;
 use IDCI\Bundle\GraphQLClientBundle\Client\GraphQLApiClientRegistryInterface;
 use IDCI\Bundle\GraphQLClientBundle\Query\GraphQLQuery;
diff --git a/tests/Unit/Service/GitLabProviderTest.php b/tests/Unit/Service/Provider/GitLabProviderTest.php
similarity index 97%
rename from tests/Unit/Service/GitLabProviderTest.php
rename to tests/Unit/Service/Provider/GitLabProviderTest.php
index 5e09aa7..ef831cb 100644
--- a/tests/Unit/Service/GitLabProviderTest.php
+++ b/tests/Unit/Service/Provider/GitLabProviderTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\GitLabProvider;
+use App\Service\Provider\GitLabProvider;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/GiteaProviderTest.php b/tests/Unit/Service/Provider/GiteaProviderTest.php
similarity index 97%
rename from tests/Unit/Service/GiteaProviderTest.php
rename to tests/Unit/Service/Provider/GiteaProviderTest.php
index 9593f29..e5ab91e 100644
--- a/tests/Unit/Service/GiteaProviderTest.php
+++ b/tests/Unit/Service/Provider/GiteaProviderTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\GiteaProvider;
+use App\Service\Provider\GiteaProvider;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/ProbeTraitTest.php b/tests/Unit/Service/Provider/ProbeTraitTest.php
similarity index 95%
rename from tests/Unit/Service/ProbeTraitTest.php
rename to tests/Unit/Service/Provider/ProbeTraitTest.php
index 64b5a28..e64c706 100644
--- a/tests/Unit/Service/ProbeTraitTest.php
+++ b/tests/Unit/Service/Provider/ProbeTraitTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\ProbeTrait;
-use App\Service\ProviderErrorCode;
-use App\Service\ProviderInterface;
-use App\Service\ProviderStatusType;
+use App\Service\Provider\ProbeTrait;
+use App\Service\Provider\ProviderErrorCode;
+use App\Service\Provider\ProviderInterface;
+use App\Service\Provider\ProviderStatusType;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/ProviderHealthCheckerTest.php b/tests/Unit/Service/Provider/ProviderHealthCheckerTest.php
similarity index 91%
rename from tests/Unit/Service/ProviderHealthCheckerTest.php
rename to tests/Unit/Service/Provider/ProviderHealthCheckerTest.php
index ebda929..20dadc1 100644
--- a/tests/Unit/Service/ProviderHealthCheckerTest.php
+++ b/tests/Unit/Service/Provider/ProviderHealthCheckerTest.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\ProviderErrorCode;
-use App\Service\ProviderHealthChecker;
-use App\Service\ProviderInterface;
-use App\Service\ProviderStatus;
-use App\Service\ProviderStatusType;
+use App\Service\Provider\ProviderErrorCode;
+use App\Service\Provider\ProviderHealthChecker;
+use App\Service\Provider\ProviderInterface;
+use App\Service\Provider\ProviderStatus;
+use App\Service\Provider\ProviderStatusType;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/ProviderStatusTest.php b/tests/Unit/Service/Provider/ProviderStatusTest.php
similarity index 91%
rename from tests/Unit/Service/ProviderStatusTest.php
rename to tests/Unit/Service/Provider/ProviderStatusTest.php
index 9ff6119..0a68547 100644
--- a/tests/Unit/Service/ProviderStatusTest.php
+++ b/tests/Unit/Service/Provider/ProviderStatusTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Provider;
 
-use App\Service\ProviderErrorCode;
-use App\Service\ProviderStatus;
-use App\Service\ProviderStatusType;
+use App\Service\Provider\ProviderErrorCode;
+use App\Service\Provider\ProviderStatus;
+use App\Service\Provider\ProviderStatusType;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Service/SvgRendererTest.php b/tests/Unit/Service/Renderer/SvgRendererTest.php
similarity index 97%
rename from tests/Unit/Service/SvgRendererTest.php
rename to tests/Unit/Service/Renderer/SvgRendererTest.php
index 1576650..a8338d8 100644
--- a/tests/Unit/Service/SvgRendererTest.php
+++ b/tests/Unit/Service/Renderer/SvgRendererTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Unit\Service;
+namespace App\Tests\Unit\Service\Renderer;
 
-use App\Service\SvgRenderer;
+use App\Service\Renderer\SvgRenderer;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;