diff --git a/src/RedisClient.php b/src/Client/RedisClient.php
similarity index 95%
rename from src/RedisClient.php
rename to src/Client/RedisClient.php
index 15e6a76..0378d51 100644
--- a/src/RedisClient.php
+++ b/src/Client/RedisClient.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Palicao\PhpRedisTimeSeries;
+namespace Palicao\PhpRedisTimeSeries\Client;
 
 use Palicao\PhpRedisTimeSeries\Exception\RedisClientException;
 use Redis;
 use RedisException;
 
-class RedisClient
+class RedisClient implements RedisClientInterface
 {
     /** @var Redis */
     private $redis;
diff --git a/src/Client/RedisClientInterface.php b/src/Client/RedisClientInterface.php
new file mode 100644
index 0000000..ca5ff08
--- /dev/null
+++ b/src/Client/RedisClientInterface.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace Palicao\PhpRedisTimeSeries\Client;
+
+interface RedisClientInterface
+{
+    function executeCommand(array $params);
+}
\ No newline at end of file
diff --git a/src/RedisConnectionParams.php b/src/Client/RedisConnectionParams.php
similarity index 98%
rename from src/RedisConnectionParams.php
rename to src/Client/RedisConnectionParams.php
index 4252e3d..5d23d92 100644
--- a/src/RedisConnectionParams.php
+++ b/src/Client/RedisConnectionParams.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Palicao\PhpRedisTimeSeries;
+namespace Palicao\PhpRedisTimeSeries\Client;
 
 class RedisConnectionParams
 {
diff --git a/src/TimeSeries.php b/src/TimeSeries.php
index 0655baf..bcd84fb 100644
--- a/src/TimeSeries.php
+++ b/src/TimeSeries.php
@@ -4,18 +4,19 @@
 namespace Palicao\PhpRedisTimeSeries;
 
 use DateTimeInterface;
+use Palicao\PhpRedisTimeSeries\Client\RedisClientInterface;
 use Palicao\PhpRedisTimeSeries\Exception\RedisClientException;
 use RedisException;
 
 class TimeSeries
 {
-    /** @var RedisClient */
+    /** @var RedisClientInterface */
     private $redis;
 
     /**
-     * @param RedisClient $redis
+     * @param RedisClientInterface $redis
      */
-    public function __construct(RedisClient $redis)
+    public function __construct(RedisClientInterface $redis)
     {
         $this->redis = $redis;
     }
diff --git a/tests/Integration/IntegrationTest.php b/tests/Integration/IntegrationTest.php
index 065ccc9..59ed5ef 100644
--- a/tests/Integration/IntegrationTest.php
+++ b/tests/Integration/IntegrationTest.php
@@ -12,8 +12,8 @@
 use Palicao\PhpRedisTimeSeries\DateTimeUtils;
 use Palicao\PhpRedisTimeSeries\Filter;
 use Palicao\PhpRedisTimeSeries\Label;
-use Palicao\PhpRedisTimeSeries\RedisClient;
-use Palicao\PhpRedisTimeSeries\RedisConnectionParams;
+use Palicao\PhpRedisTimeSeries\Client\RedisClient;
+use Palicao\PhpRedisTimeSeries\Client\RedisConnectionParams;
 use Palicao\PhpRedisTimeSeries\Sample;
 use Palicao\PhpRedisTimeSeries\TimeSeries;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/RedisClientTest.php b/tests/Unit/RedisClientTest.php
index a7161cb..9515348 100644
--- a/tests/Unit/RedisClientTest.php
+++ b/tests/Unit/RedisClientTest.php
@@ -5,8 +5,8 @@
 namespace Palicao\PhpRedisTimeSeries\Tests\Unit;
 
 use Palicao\PhpRedisTimeSeries\Exception\RedisClientException;
-use Palicao\PhpRedisTimeSeries\RedisClient;
-use Palicao\PhpRedisTimeSeries\RedisConnectionParams;
+use Palicao\PhpRedisTimeSeries\Client\RedisClient;
+use Palicao\PhpRedisTimeSeries\Client\RedisConnectionParams;
 use PHPUnit\Framework\Constraint\IsType;
 use PHPUnit\Framework\TestCase;
 use Redis;
diff --git a/tests/Unit/TimeSeriesTest.php b/tests/Unit/TimeSeriesTest.php
index 433b3de..a9d92a2 100644
--- a/tests/Unit/TimeSeriesTest.php
+++ b/tests/Unit/TimeSeriesTest.php
@@ -10,7 +10,7 @@
 use Palicao\PhpRedisTimeSeries\Filter;
 use Palicao\PhpRedisTimeSeries\Label;
 use Palicao\PhpRedisTimeSeries\Metadata;
-use Palicao\PhpRedisTimeSeries\RedisClient;
+use Palicao\PhpRedisTimeSeries\Client\RedisClient;
 use Palicao\PhpRedisTimeSeries\Sample;
 use Palicao\PhpRedisTimeSeries\TimeSeries;
 use PHPUnit\Framework\MockObject\MockObject;