diff --git a/src/Command/LexBoundary.php b/src/Command/Option/LexBoundary.php
similarity index 95%
rename from src/Command/LexBoundary.php
rename to src/Command/Option/LexBoundary.php
index e048025..e4512aa 100644
--- a/src/Command/LexBoundary.php
+++ b/src/Command/Option/LexBoundary.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Redis\Command;
+namespace Amp\Redis\Command\Option;
 
 final class LexBoundary
 {
diff --git a/src/Command/RangeOptions.php b/src/Command/Option/RangeOptions.php
similarity index 96%
rename from src/Command/RangeOptions.php
rename to src/Command/Option/RangeOptions.php
index c4348a3..964f381 100644
--- a/src/Command/RangeOptions.php
+++ b/src/Command/Option/RangeOptions.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Redis\Command;
+namespace Amp\Redis\Command\Option;
 
 final class RangeOptions
 {
diff --git a/src/Command/RedisSetOptions.php b/src/Command/Option/RedisSetOptions.php
similarity index 97%
rename from src/Command/RedisSetOptions.php
rename to src/Command/Option/RedisSetOptions.php
index 61166ff..ec47d2e 100644
--- a/src/Command/RedisSetOptions.php
+++ b/src/Command/Option/RedisSetOptions.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Redis\Command;
+namespace Amp\Redis\Command\Option;
 
 final class RedisSetOptions
 {
diff --git a/src/Command/RedisSortOptions.php b/src/Command/Option/RedisSortOptions.php
similarity index 98%
rename from src/Command/RedisSortOptions.php
rename to src/Command/Option/RedisSortOptions.php
index b7ed8de..6a0ae64 100644
--- a/src/Command/RedisSortOptions.php
+++ b/src/Command/Option/RedisSortOptions.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Redis\Command;
+namespace Amp\Redis\Command\Option;
 
 final class RedisSortOptions
 {
diff --git a/src/Command/ScoreBoundary.php b/src/Command/Option/ScoreBoundary.php
similarity index 94%
rename from src/Command/ScoreBoundary.php
rename to src/Command/Option/ScoreBoundary.php
index ab60246..4930fb4 100644
--- a/src/Command/ScoreBoundary.php
+++ b/src/Command/Option/ScoreBoundary.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Redis\Command;
+namespace Amp\Redis\Command\Option;
 
 final class ScoreBoundary
 {
diff --git a/src/Command/RedisCommands.php b/src/Command/RedisCommands.php
index 8b596e6..cee8fb3 100644
--- a/src/Command/RedisCommands.php
+++ b/src/Command/RedisCommands.php
@@ -5,6 +5,7 @@
 
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
+use Amp\Redis\Command\Option\RedisSetOptions;
 use Amp\Redis\Protocol\QueryException;
 use Amp\Redis\RedisClient;
 use function Amp\Redis\Internal;
diff --git a/src/Command/RedisList.php b/src/Command/RedisList.php
index 0ef6379..c984312 100644
--- a/src/Command/RedisList.php
+++ b/src/Command/RedisList.php
@@ -5,6 +5,7 @@
 
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
+use Amp\Redis\Command\Option\RedisSortOptions;
 use Amp\Redis\RedisClient;
 
 final class RedisList
diff --git a/src/Command/RedisSet.php b/src/Command/RedisSet.php
index 639f30e..cf11579 100644
--- a/src/Command/RedisSet.php
+++ b/src/Command/RedisSet.php
@@ -5,6 +5,7 @@
 
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
+use Amp\Redis\Command\Option\RedisSortOptions;
 use Amp\Redis\RedisClient;
 
 final class RedisSet
diff --git a/src/Command/RedisSortedSet.php b/src/Command/RedisSortedSet.php
index bc337c6..0847d07 100644
--- a/src/Command/RedisSortedSet.php
+++ b/src/Command/RedisSortedSet.php
@@ -4,6 +4,10 @@
 
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
+use Amp\Redis\Command\Option\LexBoundary;
+use Amp\Redis\Command\Option\RangeOptions;
+use Amp\Redis\Command\Option\RedisSortOptions;
+use Amp\Redis\Command\Option\ScoreBoundary;
 use Amp\Redis\RedisClient;
 use function Amp\Redis\Internal\toMap;
 
diff --git a/src/RedisCache.php b/src/RedisCache.php
index c8dec97..c8ff15a 100644
--- a/src/RedisCache.php
+++ b/src/RedisCache.php
@@ -6,8 +6,8 @@
 use Amp\Cache\CacheException;
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
+use Amp\Redis\Command\Option\RedisSetOptions;
 use Amp\Redis\Command\RedisCommands;
-use Amp\Redis\Command\RedisSetOptions;
 use Amp\Serialization\NativeSerializer;
 use Amp\Serialization\Serializer;
 
diff --git a/test/RedisListTest.php b/test/RedisListTest.php
index 9f2c94e..af8431d 100644
--- a/test/RedisListTest.php
+++ b/test/RedisListTest.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Redis;
 
-use Amp\Redis\Command\RedisSortOptions;
+use Amp\Redis\Command\Option\RedisSortOptions;
 
 class RedisListTest extends IntegrationTest
 {
diff --git a/test/RedisSetOptionsTest.php b/test/RedisSetOptionsTest.php
index c9324e2..954b104 100644
--- a/test/RedisSetOptionsTest.php
+++ b/test/RedisSetOptionsTest.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Redis;
 
-use Amp\Redis\Command\RedisSetOptions;
+use Amp\Redis\Command\Option\RedisSetOptions;
 use PHPUnit\Framework\TestCase;
 
 class RedisSetOptionsTest extends TestCase
diff --git a/test/RedisSortOptionsTest.php b/test/RedisSortOptionsTest.php
index 40568a5..a23ea01 100644
--- a/test/RedisSortOptionsTest.php
+++ b/test/RedisSortOptionsTest.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Redis;
 
-use Amp\Redis\Command\RedisSortOptions;
+use Amp\Redis\Command\Option\RedisSortOptions;
 use PHPUnit\Framework\TestCase;
 
 class RedisSortOptionsTest extends TestCase
diff --git a/test/RedisSortedSetTest.php b/test/RedisSortedSetTest.php
index e4ac5ab..d90e483 100644
--- a/test/RedisSortedSetTest.php
+++ b/test/RedisSortedSetTest.php
@@ -2,9 +2,9 @@
 
 namespace Amp\Redis;
 
-use Amp\Redis\Command\LexBoundary;
-use Amp\Redis\Command\RangeOptions;
-use Amp\Redis\Command\ScoreBoundary;
+use Amp\Redis\Command\Option\LexBoundary;
+use Amp\Redis\Command\Option\RangeOptions;
+use Amp\Redis\Command\Option\ScoreBoundary;
 
 class RedisSortedSetTest extends IntegrationTest
 {