diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php
index 2976e5b0..b226933c 100644
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI;
 
-use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
+use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
diff --git a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php b/module/CLI/src/Command/Visit/ProcessVisitsCommand.php
index 3d36695c..799b51e9 100644
--- a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php
+++ b/module/CLI/src/Command/Visit/ProcessVisitsCommand.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
+use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
diff --git a/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php b/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
index 361e23d0..e2a36ba6 100644
--- a/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
+++ b/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
@@ -7,7 +7,7 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;
-use Shlinkio\Shlink\Common\Service\IpApiLocationResolver;
+use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Model\Visitor;
diff --git a/module/Common/config/dependencies.config.php b/module/Common/config/dependencies.config.php
index d8df79aa..4b63f602 100644
--- a/module/Common/config/dependencies.config.php
+++ b/module/Common/config/dependencies.config.php
@@ -34,8 +34,8 @@ return [
 
             Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
 
-            Service\IpApiLocationResolver::class => ConfigAbstractFactory::class,
-            Service\GeoLite2LocationResolver::class => ConfigAbstractFactory::class,
+            IpGeolocation\IpApiLocationResolver::class => ConfigAbstractFactory::class,
+            IpGeolocation\GeoLite2LocationResolver::class => ConfigAbstractFactory::class,
             Service\PreviewGenerator::class => ConfigAbstractFactory::class,
         ],
         'aliases' => [
@@ -45,7 +45,7 @@ return [
             'logger' => LoggerInterface::class,
             Logger::class => 'Logger_Shlink',
             LoggerInterface::class => 'Logger_Shlink',
-            Service\IpLocationResolverInterface::class => Service\GeoLite2LocationResolver::class,
+            IpGeolocation\IpLocationResolverInterface::class => IpGeolocation\GeoLite2LocationResolver::class,
         ],
         'abstract_factories' => [
             Factory\DottedAccessConfigAbstractFactory::class,
@@ -57,8 +57,8 @@ return [
 
         Template\Extension\TranslatorExtension::class => ['translator'],
         Middleware\LocaleMiddleware::class => ['translator'],
-        Service\IpApiLocationResolver::class => ['httpClient'],
-        Service\GeoLite2LocationResolver::class => [Reader::class],
+        IpGeolocation\IpApiLocationResolver::class => ['httpClient'],
+        IpGeolocation\GeoLite2LocationResolver::class => [Reader::class],
         Service\PreviewGenerator::class => [
             Image\ImageBuilder::class,
             Filesystem::class,
diff --git a/module/Common/src/Service/GeoLite2LocationResolver.php b/module/Common/src/IpGeolocation/GeoLite2LocationResolver.php
similarity index 97%
rename from module/Common/src/Service/GeoLite2LocationResolver.php
rename to module/Common/src/IpGeolocation/GeoLite2LocationResolver.php
index 104a1ab3..68becdb6 100644
--- a/module/Common/src/Service/GeoLite2LocationResolver.php
+++ b/module/Common/src/IpGeolocation/GeoLite2LocationResolver.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Service;
+namespace Shlinkio\Shlink\Common\IpGeolocation;
 
 use GeoIp2\Database\Reader;
 use GeoIp2\Exception\AddressNotFoundException;
diff --git a/module/Common/src/Service/IpApiLocationResolver.php b/module/Common/src/IpGeolocation/IpApiLocationResolver.php
similarity index 97%
rename from module/Common/src/Service/IpApiLocationResolver.php
rename to module/Common/src/IpGeolocation/IpApiLocationResolver.php
index 58544c29..6bf426bf 100644
--- a/module/Common/src/Service/IpApiLocationResolver.php
+++ b/module/Common/src/IpGeolocation/IpApiLocationResolver.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Service;
+namespace Shlinkio\Shlink\Common\IpGeolocation;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
diff --git a/module/Common/src/Service/IpLocationResolverInterface.php b/module/Common/src/IpGeolocation/IpLocationResolverInterface.php
similarity index 93%
rename from module/Common/src/Service/IpLocationResolverInterface.php
rename to module/Common/src/IpGeolocation/IpLocationResolverInterface.php
index 98099946..47375e45 100644
--- a/module/Common/src/Service/IpLocationResolverInterface.php
+++ b/module/Common/src/IpGeolocation/IpLocationResolverInterface.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Service;
+namespace Shlinkio\Shlink\Common\IpGeolocation;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
 
diff --git a/module/Common/test/Service/IpApiLocationResolverTest.php b/module/Common/test/IpGeolocation/IpApiLocationResolverTest.php
similarity index 95%
rename from module/Common/test/Service/IpApiLocationResolverTest.php
rename to module/Common/test/IpGeolocation/IpApiLocationResolverTest.php
index 27c43895..c8c11499 100644
--- a/module/Common/test/Service/IpApiLocationResolverTest.php
+++ b/module/Common/test/IpGeolocation/IpApiLocationResolverTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Service;
+namespace ShlinkioTest\Shlink\Common\IpGeolocation;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\Common\Service\IpApiLocationResolver;
+use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
 use function json_encode;
 
 class IpApiLocationResolverTest extends TestCase