diff --git a/redisson/src/main/java/org/redisson/PubSubMessageListener.java b/redisson/src/main/java/org/redisson/PubSubMessageListener.java
index bb158e19c..3d205fa9e 100644
--- a/redisson/src/main/java/org/redisson/PubSubMessageListener.java
+++ b/redisson/src/main/java/org/redisson/PubSubMessageListener.java
@@ -15,7 +15,7 @@
  */
 package org.redisson;
 
-import org.redisson.api.MessageListener;
+import org.redisson.api.listener.MessageListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.protocol.pubsub.PubSubType;
 
diff --git a/redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java b/redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java
index 7921b9598..14a0faf5a 100644
--- a/redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java
+++ b/redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java
@@ -15,8 +15,8 @@
  */
 package org.redisson;
 
-import org.redisson.api.MessageListener;
-import org.redisson.api.PatternMessageListener;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.PatternMessageListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.protocol.pubsub.PubSubType;
 
diff --git a/redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java b/redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java
index a84dde551..93702acb0 100644
--- a/redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java
+++ b/redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java
@@ -15,7 +15,7 @@
  */
 package org.redisson;
 
-import org.redisson.api.PatternStatusListener;
+import org.redisson.api.listener.PatternStatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.protocol.pubsub.PubSubType;
 
diff --git a/redisson/src/main/java/org/redisson/PubSubStatusListener.java b/redisson/src/main/java/org/redisson/PubSubStatusListener.java
index b08993142..317b95ed9 100644
--- a/redisson/src/main/java/org/redisson/PubSubStatusListener.java
+++ b/redisson/src/main/java/org/redisson/PubSubStatusListener.java
@@ -15,7 +15,7 @@
  */
 package org.redisson;
 
-import org.redisson.api.StatusListener;
+import org.redisson.api.listener.StatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.protocol.pubsub.PubSubType;
 
diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
index 6ef210ec5..6a4f95e72 100644
--- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java
+++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
@@ -37,7 +37,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.redisson.api.MessageListener;
 import org.redisson.api.RAtomicLong;
 import org.redisson.api.RBucket;
 import org.redisson.api.RExecutorService;
@@ -46,6 +45,7 @@ import org.redisson.api.RKeys;
 import org.redisson.api.RTopic;
 import org.redisson.api.RemoteInvocationOptions;
 import org.redisson.api.annotation.RInject;
+import org.redisson.api.listener.MessageListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandExecutor;
diff --git a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java
index 1a4901bb5..52bc043c3 100644
--- a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java
+++ b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java
@@ -18,9 +18,9 @@ package org.redisson;
 import java.util.Collections;
 import java.util.List;
 
-import org.redisson.api.PatternMessageListener;
-import org.redisson.api.PatternStatusListener;
 import org.redisson.api.RPatternTopic;
+import org.redisson.api.listener.PatternMessageListener;
+import org.redisson.api.listener.PatternStatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.command.CommandExecutor;
diff --git a/redisson/src/main/java/org/redisson/RedissonTopic.java b/redisson/src/main/java/org/redisson/RedissonTopic.java
index 078f33de6..5e290bce4 100644
--- a/redisson/src/main/java/org/redisson/RedissonTopic.java
+++ b/redisson/src/main/java/org/redisson/RedissonTopic.java
@@ -18,10 +18,10 @@ package org.redisson;
 import java.util.Collections;
 import java.util.List;
 
-import org.redisson.api.MessageListener;
 import org.redisson.api.RFuture;
 import org.redisson.api.RTopic;
-import org.redisson.api.StatusListener;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.StatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
diff --git a/redisson/src/main/java/org/redisson/api/RPatternTopic.java b/redisson/src/main/java/org/redisson/api/RPatternTopic.java
index 40255faba..3a29d6cc4 100644
--- a/redisson/src/main/java/org/redisson/api/RPatternTopic.java
+++ b/redisson/src/main/java/org/redisson/api/RPatternTopic.java
@@ -17,6 +17,9 @@ package org.redisson.api;
 
 import java.util.List;
 
+import org.redisson.api.listener.PatternMessageListener;
+import org.redisson.api.listener.PatternStatusListener;
+
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.
  *
@@ -40,7 +43,7 @@ public interface RPatternTopic<M> {
      *
      * @param listener
      * @return locally unique listener id
-     * @see org.redisson.api.MessageListener
+     * @see org.redisson.api.listener.MessageListener
      */
     int addListener(PatternMessageListener<M> listener);
 
@@ -49,7 +52,7 @@ public interface RPatternTopic<M> {
      *
      * @param listener
      * @return
-     * @see org.redisson.api.StatusListener
+     * @see org.redisson.api.listener.StatusListener
      */
     int addListener(PatternStatusListener listener);
 
diff --git a/redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java b/redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
index 1f41a2174..5b5e87c4b 100644
--- a/redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
+++ b/redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
@@ -18,6 +18,8 @@ package org.redisson.api;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.listener.PatternMessageListener;
+import org.redisson.api.listener.PatternStatusListener;
 
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.
@@ -42,7 +44,7 @@ public interface RPatternTopicReactive<M> {
      *
      * @param listener
      * @return locally unique listener id
-     * @see org.redisson.api.MessageListener
+     * @see org.redisson.api.listener.MessageListener
      */
     Publisher<Integer> addListener(PatternMessageListener<M> listener);
 
@@ -51,7 +53,7 @@ public interface RPatternTopicReactive<M> {
      *
      * @param listener
      * @return
-     * @see org.redisson.api.StatusListener
+     * @see org.redisson.api.listener.StatusListener
      */
     Publisher<Integer> addListener(PatternStatusListener listener);
 
diff --git a/redisson/src/main/java/org/redisson/api/RTopic.java b/redisson/src/main/java/org/redisson/api/RTopic.java
index 187329b6b..cb709df82 100644
--- a/redisson/src/main/java/org/redisson/api/RTopic.java
+++ b/redisson/src/main/java/org/redisson/api/RTopic.java
@@ -17,6 +17,9 @@ package org.redisson.api;
 
 import java.util.List;
 
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.StatusListener;
+
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.
  *
@@ -48,7 +51,7 @@ public interface RTopic<M> extends RTopicAsync<M> {
      *
      * @param listener
      * @return locally unique listener id
-     * @see org.redisson.api.MessageListener
+     * @see org.redisson.api.listener.MessageListener
      */
     int addListener(MessageListener<M> listener);
 
@@ -57,7 +60,7 @@ public interface RTopic<M> extends RTopicAsync<M> {
      *
      * @param listener
      * @return
-     * @see org.redisson.api.StatusListener
+     * @see org.redisson.api.listener.StatusListener
      */
     int addListener(StatusListener listener);
 
diff --git a/redisson/src/main/java/org/redisson/api/RTopicReactive.java b/redisson/src/main/java/org/redisson/api/RTopicReactive.java
index 5df98c1a0..fd1433f7b 100644
--- a/redisson/src/main/java/org/redisson/api/RTopicReactive.java
+++ b/redisson/src/main/java/org/redisson/api/RTopicReactive.java
@@ -18,6 +18,8 @@ package org.redisson.api;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.StatusListener;
 
 /**
  * Distributed topic. Messages are delivered to all message listeners across Redis cluster.
diff --git a/redisson/src/main/java/org/redisson/api/BasePatternStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
similarity index 93%
rename from redisson/src/main/java/org/redisson/api/BasePatternStatusListener.java
rename to redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
index b9b0a7877..b59bc1011 100644
--- a/redisson/src/main/java/org/redisson/api/BasePatternStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
+
+import org.redisson.api.RTopic;
 
 /**
  * Base status listener for Redis PubSub channel status changes
diff --git a/redisson/src/main/java/org/redisson/api/BaseStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
similarity index 93%
rename from redisson/src/main/java/org/redisson/api/BaseStatusListener.java
rename to redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
index 9d1cd8f0a..8d900e33b 100644
--- a/redisson/src/main/java/org/redisson/api/BaseStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
+
+import org.redisson.api.RTopic;
 
 /**
  * Base status listener for Redis PubSub channel status changes
diff --git a/redisson/src/main/java/org/redisson/api/MessageListener.java b/redisson/src/main/java/org/redisson/api/listener/MessageListener.java
similarity index 93%
rename from redisson/src/main/java/org/redisson/api/MessageListener.java
rename to redisson/src/main/java/org/redisson/api/listener/MessageListener.java
index 129c0446a..bc222f1d7 100644
--- a/redisson/src/main/java/org/redisson/api/MessageListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/MessageListener.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
 
 import java.util.EventListener;
 
+import org.redisson.api.RTopic;
+
 /**
  * Listener for Redis messages published via RTopic Redisson object
  *
diff --git a/redisson/src/main/java/org/redisson/api/PatternMessageListener.java b/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
similarity index 93%
rename from redisson/src/main/java/org/redisson/api/PatternMessageListener.java
rename to redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
index c97aeee19..01dcbf581 100644
--- a/redisson/src/main/java/org/redisson/api/PatternMessageListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
 
 import java.util.EventListener;
 
+import org.redisson.api.RTopic;
+
 /**
  * Listener for Redis messages published via RTopic Redisson object
  *
diff --git a/redisson/src/main/java/org/redisson/api/PatternStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
similarity index 93%
rename from redisson/src/main/java/org/redisson/api/PatternStatusListener.java
rename to redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
index 956018b2e..30ed7136e 100644
--- a/redisson/src/main/java/org/redisson/api/PatternStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
 
 import java.util.EventListener;
 
+import org.redisson.api.RTopic;
+
 /**
  * Listener for Redis PubSub channel status changes
  *
diff --git a/redisson/src/main/java/org/redisson/api/StatusListener.java b/redisson/src/main/java/org/redisson/api/listener/StatusListener.java
similarity index 92%
rename from redisson/src/main/java/org/redisson/api/StatusListener.java
rename to redisson/src/main/java/org/redisson/api/listener/StatusListener.java
index 2cef39db5..2e497c2c5 100644
--- a/redisson/src/main/java/org/redisson/api/StatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/StatusListener.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.redisson.api;
+package org.redisson.api.listener;
 
 import java.util.EventListener;
 
+import org.redisson.api.RTopic;
+
 /**
  * Listener for Redis PubSub channel status changes
  *
diff --git a/redisson/src/main/java/org/redisson/client/RedisPubSubListener.java b/redisson/src/main/java/org/redisson/client/RedisPubSubListener.java
index ff76774c7..bf746bf62 100644
--- a/redisson/src/main/java/org/redisson/client/RedisPubSubListener.java
+++ b/redisson/src/main/java/org/redisson/client/RedisPubSubListener.java
@@ -15,7 +15,7 @@
  */
 package org.redisson.client;
 
-import org.redisson.api.MessageListener;
+import org.redisson.api.listener.MessageListener;
 import org.redisson.client.protocol.pubsub.PubSubType;
 
 public interface RedisPubSubListener<V> extends MessageListener<V> {
diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
index e10269ece..744de3995 100644
--- a/redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
+++ b/redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
@@ -21,9 +21,9 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.redisson.PubSubPatternMessageListener;
 import org.redisson.PubSubPatternStatusListener;
-import org.redisson.api.PatternMessageListener;
-import org.redisson.api.PatternStatusListener;
 import org.redisson.api.RPatternTopicReactive;
+import org.redisson.api.listener.PatternMessageListener;
+import org.redisson.api.listener.PatternStatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.command.CommandReactiveExecutor;
diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
index e9ef927e0..326e38956 100644
--- a/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
+++ b/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
@@ -21,9 +21,9 @@ import java.util.List;
 import org.reactivestreams.Publisher;
 import org.redisson.PubSubMessageListener;
 import org.redisson.PubSubStatusListener;
-import org.redisson.api.MessageListener;
 import org.redisson.api.RTopicReactive;
-import org.redisson.api.StatusListener;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.StatusListener;
 import org.redisson.client.RedisPubSubListener;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.RedisCommands;
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
index 8950f6bcf..4fdfa89c7 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
@@ -21,13 +21,13 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.redisson.RedisRunner.RedisProcess;
-import org.redisson.api.BasePatternStatusListener;
-import org.redisson.api.MessageListener;
-import org.redisson.api.PatternMessageListener;
-import org.redisson.api.PatternStatusListener;
 import org.redisson.api.RPatternTopic;
 import org.redisson.api.RTopic;
-import org.redisson.api.StatusListener;
+import org.redisson.api.listener.BasePatternStatusListener;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.PatternMessageListener;
+import org.redisson.api.listener.PatternStatusListener;
+import org.redisson.api.listener.StatusListener;
 import org.redisson.config.Config;
 
 public class RedissonTopicPatternTest {
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
index 6ca7076bf..6454658f3 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
@@ -23,12 +23,12 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.redisson.RedisRunner.RedisProcess;
-import org.redisson.api.BaseStatusListener;
-import org.redisson.api.MessageListener;
 import org.redisson.api.RBlockingQueue;
 import org.redisson.api.RSet;
 import org.redisson.api.RTopic;
-import org.redisson.api.StatusListener;
+import org.redisson.api.listener.BaseStatusListener;
+import org.redisson.api.listener.MessageListener;
+import org.redisson.api.listener.StatusListener;
 import org.redisson.client.codec.LongCodec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.config.Config;
diff --git a/redisson/src/test/java/org/redisson/TimeoutTest.java b/redisson/src/test/java/org/redisson/TimeoutTest.java
index 7b30afd00..b5faa2025 100644
--- a/redisson/src/test/java/org/redisson/TimeoutTest.java
+++ b/redisson/src/test/java/org/redisson/TimeoutTest.java
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import org.junit.Test;
-import org.redisson.api.MessageListener;
 import org.redisson.api.RMap;
 import org.redisson.api.RTopic;
+import org.redisson.api.listener.MessageListener;
 
 public class TimeoutTest extends BaseTest {