diff --git a/src/main/java/org/redisson/EvictionScheduler.java b/redisson/src/main/java/org/redisson/EvictionScheduler.java
similarity index 100%
rename from src/main/java/org/redisson/EvictionScheduler.java
rename to redisson/src/main/java/org/redisson/EvictionScheduler.java
diff --git a/src/main/java/org/redisson/PubSubEntry.java b/redisson/src/main/java/org/redisson/PubSubEntry.java
similarity index 100%
rename from src/main/java/org/redisson/PubSubEntry.java
rename to redisson/src/main/java/org/redisson/PubSubEntry.java
diff --git a/src/main/java/org/redisson/PubSubMessageListener.java b/redisson/src/main/java/org/redisson/PubSubMessageListener.java
similarity index 100%
rename from src/main/java/org/redisson/PubSubMessageListener.java
rename to redisson/src/main/java/org/redisson/PubSubMessageListener.java
diff --git a/src/main/java/org/redisson/PubSubPatternMessageListener.java b/redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java
similarity index 100%
rename from src/main/java/org/redisson/PubSubPatternMessageListener.java
rename to redisson/src/main/java/org/redisson/PubSubPatternMessageListener.java
diff --git a/src/main/java/org/redisson/PubSubPatternStatusListener.java b/redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/PubSubPatternStatusListener.java
rename to redisson/src/main/java/org/redisson/PubSubPatternStatusListener.java
diff --git a/src/main/java/org/redisson/PubSubStatusListener.java b/redisson/src/main/java/org/redisson/PubSubStatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/PubSubStatusListener.java
rename to redisson/src/main/java/org/redisson/PubSubStatusListener.java
diff --git a/src/main/java/org/redisson/RedisClientResult.java b/redisson/src/main/java/org/redisson/RedisClientResult.java
similarity index 100%
rename from src/main/java/org/redisson/RedisClientResult.java
rename to redisson/src/main/java/org/redisson/RedisClientResult.java
diff --git a/src/main/java/org/redisson/RedisClusterNodes.java b/redisson/src/main/java/org/redisson/RedisClusterNodes.java
similarity index 100%
rename from src/main/java/org/redisson/RedisClusterNodes.java
rename to redisson/src/main/java/org/redisson/RedisClusterNodes.java
diff --git a/src/main/java/org/redisson/RedisNodes.java b/redisson/src/main/java/org/redisson/RedisNodes.java
similarity index 100%
rename from src/main/java/org/redisson/RedisNodes.java
rename to redisson/src/main/java/org/redisson/RedisNodes.java
diff --git a/src/main/java/org/redisson/Redisson.java b/redisson/src/main/java/org/redisson/Redisson.java
similarity index 100%
rename from src/main/java/org/redisson/Redisson.java
rename to redisson/src/main/java/org/redisson/Redisson.java
diff --git a/src/main/java/org/redisson/RedissonAtomicDouble.java b/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonAtomicDouble.java
rename to redisson/src/main/java/org/redisson/RedissonAtomicDouble.java
diff --git a/src/main/java/org/redisson/RedissonAtomicLong.java b/redisson/src/main/java/org/redisson/RedissonAtomicLong.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonAtomicLong.java
rename to redisson/src/main/java/org/redisson/RedissonAtomicLong.java
diff --git a/src/main/java/org/redisson/RedissonBaseIterator.java b/redisson/src/main/java/org/redisson/RedissonBaseIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBaseIterator.java
rename to redisson/src/main/java/org/redisson/RedissonBaseIterator.java
diff --git a/src/main/java/org/redisson/RedissonBaseMapIterator.java b/redisson/src/main/java/org/redisson/RedissonBaseMapIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBaseMapIterator.java
rename to redisson/src/main/java/org/redisson/RedissonBaseMapIterator.java
diff --git a/src/main/java/org/redisson/RedissonBatch.java b/redisson/src/main/java/org/redisson/RedissonBatch.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBatch.java
rename to redisson/src/main/java/org/redisson/RedissonBatch.java
diff --git a/src/main/java/org/redisson/RedissonBitSet.java b/redisson/src/main/java/org/redisson/RedissonBitSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBitSet.java
rename to redisson/src/main/java/org/redisson/RedissonBitSet.java
diff --git a/src/main/java/org/redisson/RedissonBlockingDeque.java b/redisson/src/main/java/org/redisson/RedissonBlockingDeque.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBlockingDeque.java
rename to redisson/src/main/java/org/redisson/RedissonBlockingDeque.java
diff --git a/src/main/java/org/redisson/RedissonBlockingQueue.java b/redisson/src/main/java/org/redisson/RedissonBlockingQueue.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBlockingQueue.java
rename to redisson/src/main/java/org/redisson/RedissonBlockingQueue.java
diff --git a/src/main/java/org/redisson/RedissonBloomFilter.java b/redisson/src/main/java/org/redisson/RedissonBloomFilter.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBloomFilter.java
rename to redisson/src/main/java/org/redisson/RedissonBloomFilter.java
diff --git a/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java b/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
rename to redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
diff --git a/src/main/java/org/redisson/RedissonBucket.java b/redisson/src/main/java/org/redisson/RedissonBucket.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBucket.java
rename to redisson/src/main/java/org/redisson/RedissonBucket.java
diff --git a/src/main/java/org/redisson/RedissonBuckets.java b/redisson/src/main/java/org/redisson/RedissonBuckets.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonBuckets.java
rename to redisson/src/main/java/org/redisson/RedissonBuckets.java
diff --git a/src/main/java/org/redisson/RedissonClient.java b/redisson/src/main/java/org/redisson/RedissonClient.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonClient.java
rename to redisson/src/main/java/org/redisson/RedissonClient.java
diff --git a/src/main/java/org/redisson/RedissonCountDownLatch.java b/redisson/src/main/java/org/redisson/RedissonCountDownLatch.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonCountDownLatch.java
rename to redisson/src/main/java/org/redisson/RedissonCountDownLatch.java
diff --git a/src/main/java/org/redisson/RedissonCountDownLatchEntry.java b/redisson/src/main/java/org/redisson/RedissonCountDownLatchEntry.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonCountDownLatchEntry.java
rename to redisson/src/main/java/org/redisson/RedissonCountDownLatchEntry.java
diff --git a/src/main/java/org/redisson/RedissonDeque.java b/redisson/src/main/java/org/redisson/RedissonDeque.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonDeque.java
rename to redisson/src/main/java/org/redisson/RedissonDeque.java
diff --git a/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonExecutorService.java
rename to redisson/src/main/java/org/redisson/RedissonExecutorService.java
diff --git a/src/main/java/org/redisson/RedissonExpirable.java b/redisson/src/main/java/org/redisson/RedissonExpirable.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonExpirable.java
rename to redisson/src/main/java/org/redisson/RedissonExpirable.java
diff --git a/src/main/java/org/redisson/RedissonFairLock.java b/redisson/src/main/java/org/redisson/RedissonFairLock.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonFairLock.java
rename to redisson/src/main/java/org/redisson/RedissonFairLock.java
diff --git a/src/main/java/org/redisson/RedissonGeo.java b/redisson/src/main/java/org/redisson/RedissonGeo.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonGeo.java
rename to redisson/src/main/java/org/redisson/RedissonGeo.java
diff --git a/src/main/java/org/redisson/RedissonHyperLogLog.java b/redisson/src/main/java/org/redisson/RedissonHyperLogLog.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonHyperLogLog.java
rename to redisson/src/main/java/org/redisson/RedissonHyperLogLog.java
diff --git a/src/main/java/org/redisson/RedissonKeys.java b/redisson/src/main/java/org/redisson/RedissonKeys.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonKeys.java
rename to redisson/src/main/java/org/redisson/RedissonKeys.java
diff --git a/src/main/java/org/redisson/RedissonLexSortedSet.java b/redisson/src/main/java/org/redisson/RedissonLexSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonLexSortedSet.java
rename to redisson/src/main/java/org/redisson/RedissonLexSortedSet.java
diff --git a/src/main/java/org/redisson/RedissonList.java b/redisson/src/main/java/org/redisson/RedissonList.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonList.java
rename to redisson/src/main/java/org/redisson/RedissonList.java
diff --git a/src/main/java/org/redisson/RedissonListMultimap.java b/redisson/src/main/java/org/redisson/RedissonListMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonListMultimap.java
rename to redisson/src/main/java/org/redisson/RedissonListMultimap.java
diff --git a/src/main/java/org/redisson/RedissonListMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonListMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonListMultimapCache.java
rename to redisson/src/main/java/org/redisson/RedissonListMultimapCache.java
diff --git a/src/main/java/org/redisson/RedissonListMultimapIterator.java b/redisson/src/main/java/org/redisson/RedissonListMultimapIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonListMultimapIterator.java
rename to redisson/src/main/java/org/redisson/RedissonListMultimapIterator.java
diff --git a/src/main/java/org/redisson/RedissonListMultimapValues.java b/redisson/src/main/java/org/redisson/RedissonListMultimapValues.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonListMultimapValues.java
rename to redisson/src/main/java/org/redisson/RedissonListMultimapValues.java
diff --git a/src/main/java/org/redisson/RedissonLiveObjectService.java b/redisson/src/main/java/org/redisson/RedissonLiveObjectService.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonLiveObjectService.java
rename to redisson/src/main/java/org/redisson/RedissonLiveObjectService.java
diff --git a/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonLock.java
rename to redisson/src/main/java/org/redisson/RedissonLock.java
diff --git a/src/main/java/org/redisson/RedissonLockEntry.java b/redisson/src/main/java/org/redisson/RedissonLockEntry.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonLockEntry.java
rename to redisson/src/main/java/org/redisson/RedissonLockEntry.java
diff --git a/src/main/java/org/redisson/RedissonMap.java b/redisson/src/main/java/org/redisson/RedissonMap.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMap.java
rename to redisson/src/main/java/org/redisson/RedissonMap.java
diff --git a/src/main/java/org/redisson/RedissonMapCache.java b/redisson/src/main/java/org/redisson/RedissonMapCache.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMapCache.java
rename to redisson/src/main/java/org/redisson/RedissonMapCache.java
diff --git a/src/main/java/org/redisson/RedissonMapEntry.java b/redisson/src/main/java/org/redisson/RedissonMapEntry.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMapEntry.java
rename to redisson/src/main/java/org/redisson/RedissonMapEntry.java
diff --git a/src/main/java/org/redisson/RedissonMapIterator.java b/redisson/src/main/java/org/redisson/RedissonMapIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMapIterator.java
rename to redisson/src/main/java/org/redisson/RedissonMapIterator.java
diff --git a/src/main/java/org/redisson/RedissonMultiMapIterator.java b/redisson/src/main/java/org/redisson/RedissonMultiMapIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMultiMapIterator.java
rename to redisson/src/main/java/org/redisson/RedissonMultiMapIterator.java
diff --git a/src/main/java/org/redisson/RedissonMultiMapKeysIterator.java b/redisson/src/main/java/org/redisson/RedissonMultiMapKeysIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMultiMapKeysIterator.java
rename to redisson/src/main/java/org/redisson/RedissonMultiMapKeysIterator.java
diff --git a/src/main/java/org/redisson/RedissonMultimap.java b/redisson/src/main/java/org/redisson/RedissonMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMultimap.java
rename to redisson/src/main/java/org/redisson/RedissonMultimap.java
diff --git a/src/main/java/org/redisson/RedissonMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonMultimapCache.java
rename to redisson/src/main/java/org/redisson/RedissonMultimapCache.java
diff --git a/src/main/java/org/redisson/RedissonNode.java b/redisson/src/main/java/org/redisson/RedissonNode.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonNode.java
rename to redisson/src/main/java/org/redisson/RedissonNode.java
diff --git a/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonObject.java
rename to redisson/src/main/java/org/redisson/RedissonObject.java
diff --git a/src/main/java/org/redisson/RedissonPatternTopic.java b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonPatternTopic.java
rename to redisson/src/main/java/org/redisson/RedissonPatternTopic.java
diff --git a/src/main/java/org/redisson/RedissonQueue.java b/redisson/src/main/java/org/redisson/RedissonQueue.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonQueue.java
rename to redisson/src/main/java/org/redisson/RedissonQueue.java
diff --git a/src/main/java/org/redisson/RedissonQueueSemaphore.java b/redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonQueueSemaphore.java
rename to redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java
diff --git a/src/main/java/org/redisson/RedissonReactive.java b/redisson/src/main/java/org/redisson/RedissonReactive.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonReactive.java
rename to redisson/src/main/java/org/redisson/RedissonReactive.java
diff --git a/src/main/java/org/redisson/RedissonReadLock.java b/redisson/src/main/java/org/redisson/RedissonReadLock.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonReadLock.java
rename to redisson/src/main/java/org/redisson/RedissonReadLock.java
diff --git a/src/main/java/org/redisson/RedissonReadWriteLock.java b/redisson/src/main/java/org/redisson/RedissonReadWriteLock.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonReadWriteLock.java
rename to redisson/src/main/java/org/redisson/RedissonReadWriteLock.java
diff --git a/src/main/java/org/redisson/RedissonReference.java b/redisson/src/main/java/org/redisson/RedissonReference.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonReference.java
rename to redisson/src/main/java/org/redisson/RedissonReference.java
diff --git a/src/main/java/org/redisson/RedissonRemoteService.java b/redisson/src/main/java/org/redisson/RedissonRemoteService.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonRemoteService.java
rename to redisson/src/main/java/org/redisson/RedissonRemoteService.java
diff --git a/src/main/java/org/redisson/RedissonScoredSortedSet.java b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonScoredSortedSet.java
rename to redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java
diff --git a/src/main/java/org/redisson/RedissonScript.java b/redisson/src/main/java/org/redisson/RedissonScript.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonScript.java
rename to redisson/src/main/java/org/redisson/RedissonScript.java
diff --git a/src/main/java/org/redisson/RedissonSemaphore.java b/redisson/src/main/java/org/redisson/RedissonSemaphore.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSemaphore.java
rename to redisson/src/main/java/org/redisson/RedissonSemaphore.java
diff --git a/src/main/java/org/redisson/RedissonSet.java b/redisson/src/main/java/org/redisson/RedissonSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSet.java
rename to redisson/src/main/java/org/redisson/RedissonSet.java
diff --git a/src/main/java/org/redisson/RedissonSetCache.java b/redisson/src/main/java/org/redisson/RedissonSetCache.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSetCache.java
rename to redisson/src/main/java/org/redisson/RedissonSetCache.java
diff --git a/src/main/java/org/redisson/RedissonSetMultimap.java b/redisson/src/main/java/org/redisson/RedissonSetMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSetMultimap.java
rename to redisson/src/main/java/org/redisson/RedissonSetMultimap.java
diff --git a/src/main/java/org/redisson/RedissonSetMultimapCache.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSetMultimapCache.java
rename to redisson/src/main/java/org/redisson/RedissonSetMultimapCache.java
diff --git a/src/main/java/org/redisson/RedissonSetMultimapIterator.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapIterator.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSetMultimapIterator.java
rename to redisson/src/main/java/org/redisson/RedissonSetMultimapIterator.java
diff --git a/src/main/java/org/redisson/RedissonSetMultimapValues.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSetMultimapValues.java
rename to redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java
diff --git a/src/main/java/org/redisson/RedissonShutdownException.java b/redisson/src/main/java/org/redisson/RedissonShutdownException.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonShutdownException.java
rename to redisson/src/main/java/org/redisson/RedissonShutdownException.java
diff --git a/src/main/java/org/redisson/RedissonSortedSet.java b/redisson/src/main/java/org/redisson/RedissonSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSortedSet.java
rename to redisson/src/main/java/org/redisson/RedissonSortedSet.java
diff --git a/src/main/java/org/redisson/RedissonSubList.java b/redisson/src/main/java/org/redisson/RedissonSubList.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSubList.java
rename to redisson/src/main/java/org/redisson/RedissonSubList.java
diff --git a/src/main/java/org/redisson/RedissonSubSortedSet.java b/redisson/src/main/java/org/redisson/RedissonSubSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonSubSortedSet.java
rename to redisson/src/main/java/org/redisson/RedissonSubSortedSet.java
diff --git a/src/main/java/org/redisson/RedissonTopic.java b/redisson/src/main/java/org/redisson/RedissonTopic.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonTopic.java
rename to redisson/src/main/java/org/redisson/RedissonTopic.java
diff --git a/src/main/java/org/redisson/RedissonWriteLock.java b/redisson/src/main/java/org/redisson/RedissonWriteLock.java
similarity index 100%
rename from src/main/java/org/redisson/RedissonWriteLock.java
rename to redisson/src/main/java/org/redisson/RedissonWriteLock.java
diff --git a/src/main/java/org/redisson/SlotCallback.java b/redisson/src/main/java/org/redisson/SlotCallback.java
similarity index 100%
rename from src/main/java/org/redisson/SlotCallback.java
rename to redisson/src/main/java/org/redisson/SlotCallback.java
diff --git a/src/main/java/org/redisson/Version.java b/redisson/src/main/java/org/redisson/Version.java
similarity index 100%
rename from src/main/java/org/redisson/Version.java
rename to redisson/src/main/java/org/redisson/Version.java
diff --git a/src/main/java/org/redisson/api/BasePatternStatusListener.java b/redisson/src/main/java/org/redisson/api/BasePatternStatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/BasePatternStatusListener.java
rename to redisson/src/main/java/org/redisson/api/BasePatternStatusListener.java
diff --git a/src/main/java/org/redisson/api/BaseStatusListener.java b/redisson/src/main/java/org/redisson/api/BaseStatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/BaseStatusListener.java
rename to redisson/src/main/java/org/redisson/api/BaseStatusListener.java
diff --git a/src/main/java/org/redisson/api/ClusterNode.java b/redisson/src/main/java/org/redisson/api/ClusterNode.java
similarity index 100%
rename from src/main/java/org/redisson/api/ClusterNode.java
rename to redisson/src/main/java/org/redisson/api/ClusterNode.java
diff --git a/src/main/java/org/redisson/api/ClusterNodesGroup.java b/redisson/src/main/java/org/redisson/api/ClusterNodesGroup.java
similarity index 100%
rename from src/main/java/org/redisson/api/ClusterNodesGroup.java
rename to redisson/src/main/java/org/redisson/api/ClusterNodesGroup.java
diff --git a/src/main/java/org/redisson/api/GeoEntry.java b/redisson/src/main/java/org/redisson/api/GeoEntry.java
similarity index 100%
rename from src/main/java/org/redisson/api/GeoEntry.java
rename to redisson/src/main/java/org/redisson/api/GeoEntry.java
diff --git a/src/main/java/org/redisson/api/GeoPosition.java b/redisson/src/main/java/org/redisson/api/GeoPosition.java
similarity index 100%
rename from src/main/java/org/redisson/api/GeoPosition.java
rename to redisson/src/main/java/org/redisson/api/GeoPosition.java
diff --git a/src/main/java/org/redisson/api/GeoUnit.java b/redisson/src/main/java/org/redisson/api/GeoUnit.java
similarity index 100%
rename from src/main/java/org/redisson/api/GeoUnit.java
rename to redisson/src/main/java/org/redisson/api/GeoUnit.java
diff --git a/src/main/java/org/redisson/api/MessageListener.java b/redisson/src/main/java/org/redisson/api/MessageListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/MessageListener.java
rename to redisson/src/main/java/org/redisson/api/MessageListener.java
diff --git a/src/main/java/org/redisson/api/Node.java b/redisson/src/main/java/org/redisson/api/Node.java
similarity index 100%
rename from src/main/java/org/redisson/api/Node.java
rename to redisson/src/main/java/org/redisson/api/Node.java
diff --git a/src/main/java/org/redisson/api/NodeListener.java b/redisson/src/main/java/org/redisson/api/NodeListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/NodeListener.java
rename to redisson/src/main/java/org/redisson/api/NodeListener.java
diff --git a/src/main/java/org/redisson/api/NodeType.java b/redisson/src/main/java/org/redisson/api/NodeType.java
similarity index 100%
rename from src/main/java/org/redisson/api/NodeType.java
rename to redisson/src/main/java/org/redisson/api/NodeType.java
diff --git a/src/main/java/org/redisson/api/NodesGroup.java b/redisson/src/main/java/org/redisson/api/NodesGroup.java
similarity index 100%
rename from src/main/java/org/redisson/api/NodesGroup.java
rename to redisson/src/main/java/org/redisson/api/NodesGroup.java
diff --git a/src/main/java/org/redisson/api/PatternMessageListener.java b/redisson/src/main/java/org/redisson/api/PatternMessageListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/PatternMessageListener.java
rename to redisson/src/main/java/org/redisson/api/PatternMessageListener.java
diff --git a/src/main/java/org/redisson/api/PatternStatusListener.java b/redisson/src/main/java/org/redisson/api/PatternStatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/PatternStatusListener.java
rename to redisson/src/main/java/org/redisson/api/PatternStatusListener.java
diff --git a/src/main/java/org/redisson/api/Predicate.java b/redisson/src/main/java/org/redisson/api/Predicate.java
similarity index 100%
rename from src/main/java/org/redisson/api/Predicate.java
rename to redisson/src/main/java/org/redisson/api/Predicate.java
diff --git a/src/main/java/org/redisson/api/RAtomicDouble.java b/redisson/src/main/java/org/redisson/api/RAtomicDouble.java
similarity index 100%
rename from src/main/java/org/redisson/api/RAtomicDouble.java
rename to redisson/src/main/java/org/redisson/api/RAtomicDouble.java
diff --git a/src/main/java/org/redisson/api/RAtomicDoubleAsync.java b/redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RAtomicDoubleAsync.java
rename to redisson/src/main/java/org/redisson/api/RAtomicDoubleAsync.java
diff --git a/src/main/java/org/redisson/api/RAtomicLong.java b/redisson/src/main/java/org/redisson/api/RAtomicLong.java
similarity index 100%
rename from src/main/java/org/redisson/api/RAtomicLong.java
rename to redisson/src/main/java/org/redisson/api/RAtomicLong.java
diff --git a/src/main/java/org/redisson/api/RAtomicLongAsync.java b/redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RAtomicLongAsync.java
rename to redisson/src/main/java/org/redisson/api/RAtomicLongAsync.java
diff --git a/src/main/java/org/redisson/api/RAtomicLongReactive.java b/redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RAtomicLongReactive.java
rename to redisson/src/main/java/org/redisson/api/RAtomicLongReactive.java
diff --git a/src/main/java/org/redisson/api/RBatch.java b/redisson/src/main/java/org/redisson/api/RBatch.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBatch.java
rename to redisson/src/main/java/org/redisson/api/RBatch.java
diff --git a/src/main/java/org/redisson/api/RBatchReactive.java b/redisson/src/main/java/org/redisson/api/RBatchReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBatchReactive.java
rename to redisson/src/main/java/org/redisson/api/RBatchReactive.java
diff --git a/src/main/java/org/redisson/api/RBitSet.java b/redisson/src/main/java/org/redisson/api/RBitSet.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBitSet.java
rename to redisson/src/main/java/org/redisson/api/RBitSet.java
diff --git a/src/main/java/org/redisson/api/RBitSetAsync.java b/redisson/src/main/java/org/redisson/api/RBitSetAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBitSetAsync.java
rename to redisson/src/main/java/org/redisson/api/RBitSetAsync.java
diff --git a/src/main/java/org/redisson/api/RBitSetReactive.java b/redisson/src/main/java/org/redisson/api/RBitSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBitSetReactive.java
rename to redisson/src/main/java/org/redisson/api/RBitSetReactive.java
diff --git a/src/main/java/org/redisson/api/RBlockingDeque.java b/redisson/src/main/java/org/redisson/api/RBlockingDeque.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBlockingDeque.java
rename to redisson/src/main/java/org/redisson/api/RBlockingDeque.java
diff --git a/src/main/java/org/redisson/api/RBlockingDequeAsync.java b/redisson/src/main/java/org/redisson/api/RBlockingDequeAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBlockingDequeAsync.java
rename to redisson/src/main/java/org/redisson/api/RBlockingDequeAsync.java
diff --git a/src/main/java/org/redisson/api/RBlockingQueue.java b/redisson/src/main/java/org/redisson/api/RBlockingQueue.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBlockingQueue.java
rename to redisson/src/main/java/org/redisson/api/RBlockingQueue.java
diff --git a/src/main/java/org/redisson/api/RBlockingQueueAsync.java b/redisson/src/main/java/org/redisson/api/RBlockingQueueAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBlockingQueueAsync.java
rename to redisson/src/main/java/org/redisson/api/RBlockingQueueAsync.java
diff --git a/src/main/java/org/redisson/api/RBlockingQueueReactive.java b/redisson/src/main/java/org/redisson/api/RBlockingQueueReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBlockingQueueReactive.java
rename to redisson/src/main/java/org/redisson/api/RBlockingQueueReactive.java
diff --git a/src/main/java/org/redisson/api/RBloomFilter.java b/redisson/src/main/java/org/redisson/api/RBloomFilter.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBloomFilter.java
rename to redisson/src/main/java/org/redisson/api/RBloomFilter.java
diff --git a/src/main/java/org/redisson/api/RBoundedBlockingQueue.java b/redisson/src/main/java/org/redisson/api/RBoundedBlockingQueue.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBoundedBlockingQueue.java
rename to redisson/src/main/java/org/redisson/api/RBoundedBlockingQueue.java
diff --git a/src/main/java/org/redisson/api/RBoundedBlockingQueueAsync.java b/redisson/src/main/java/org/redisson/api/RBoundedBlockingQueueAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBoundedBlockingQueueAsync.java
rename to redisson/src/main/java/org/redisson/api/RBoundedBlockingQueueAsync.java
diff --git a/src/main/java/org/redisson/api/RBucket.java b/redisson/src/main/java/org/redisson/api/RBucket.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBucket.java
rename to redisson/src/main/java/org/redisson/api/RBucket.java
diff --git a/src/main/java/org/redisson/api/RBucketAsync.java b/redisson/src/main/java/org/redisson/api/RBucketAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBucketAsync.java
rename to redisson/src/main/java/org/redisson/api/RBucketAsync.java
diff --git a/src/main/java/org/redisson/api/RBucketReactive.java b/redisson/src/main/java/org/redisson/api/RBucketReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBucketReactive.java
rename to redisson/src/main/java/org/redisson/api/RBucketReactive.java
diff --git a/src/main/java/org/redisson/api/RBuckets.java b/redisson/src/main/java/org/redisson/api/RBuckets.java
similarity index 100%
rename from src/main/java/org/redisson/api/RBuckets.java
rename to redisson/src/main/java/org/redisson/api/RBuckets.java
diff --git a/src/main/java/org/redisson/api/RCollectionAsync.java b/redisson/src/main/java/org/redisson/api/RCollectionAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RCollectionAsync.java
rename to redisson/src/main/java/org/redisson/api/RCollectionAsync.java
diff --git a/src/main/java/org/redisson/api/RCollectionReactive.java b/redisson/src/main/java/org/redisson/api/RCollectionReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RCollectionReactive.java
rename to redisson/src/main/java/org/redisson/api/RCollectionReactive.java
diff --git a/src/main/java/org/redisson/api/RCountDownLatch.java b/redisson/src/main/java/org/redisson/api/RCountDownLatch.java
similarity index 100%
rename from src/main/java/org/redisson/api/RCountDownLatch.java
rename to redisson/src/main/java/org/redisson/api/RCountDownLatch.java
diff --git a/src/main/java/org/redisson/api/RCountDownLatchAsync.java b/redisson/src/main/java/org/redisson/api/RCountDownLatchAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RCountDownLatchAsync.java
rename to redisson/src/main/java/org/redisson/api/RCountDownLatchAsync.java
diff --git a/src/main/java/org/redisson/api/RDeque.java b/redisson/src/main/java/org/redisson/api/RDeque.java
similarity index 100%
rename from src/main/java/org/redisson/api/RDeque.java
rename to redisson/src/main/java/org/redisson/api/RDeque.java
diff --git a/src/main/java/org/redisson/api/RDequeAsync.java b/redisson/src/main/java/org/redisson/api/RDequeAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RDequeAsync.java
rename to redisson/src/main/java/org/redisson/api/RDequeAsync.java
diff --git a/src/main/java/org/redisson/api/RDequeReactive.java b/redisson/src/main/java/org/redisson/api/RDequeReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RDequeReactive.java
rename to redisson/src/main/java/org/redisson/api/RDequeReactive.java
diff --git a/src/main/java/org/redisson/api/RExecutorService.java b/redisson/src/main/java/org/redisson/api/RExecutorService.java
similarity index 100%
rename from src/main/java/org/redisson/api/RExecutorService.java
rename to redisson/src/main/java/org/redisson/api/RExecutorService.java
diff --git a/src/main/java/org/redisson/api/RExpirable.java b/redisson/src/main/java/org/redisson/api/RExpirable.java
similarity index 100%
rename from src/main/java/org/redisson/api/RExpirable.java
rename to redisson/src/main/java/org/redisson/api/RExpirable.java
diff --git a/src/main/java/org/redisson/api/RExpirableAsync.java b/redisson/src/main/java/org/redisson/api/RExpirableAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RExpirableAsync.java
rename to redisson/src/main/java/org/redisson/api/RExpirableAsync.java
diff --git a/src/main/java/org/redisson/api/RExpirableReactive.java b/redisson/src/main/java/org/redisson/api/RExpirableReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RExpirableReactive.java
rename to redisson/src/main/java/org/redisson/api/RExpirableReactive.java
diff --git a/src/main/java/org/redisson/api/RGeo.java b/redisson/src/main/java/org/redisson/api/RGeo.java
similarity index 100%
rename from src/main/java/org/redisson/api/RGeo.java
rename to redisson/src/main/java/org/redisson/api/RGeo.java
diff --git a/src/main/java/org/redisson/api/RGeoAsync.java b/redisson/src/main/java/org/redisson/api/RGeoAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RGeoAsync.java
rename to redisson/src/main/java/org/redisson/api/RGeoAsync.java
diff --git a/src/main/java/org/redisson/api/RHyperLogLog.java b/redisson/src/main/java/org/redisson/api/RHyperLogLog.java
similarity index 100%
rename from src/main/java/org/redisson/api/RHyperLogLog.java
rename to redisson/src/main/java/org/redisson/api/RHyperLogLog.java
diff --git a/src/main/java/org/redisson/api/RHyperLogLogAsync.java b/redisson/src/main/java/org/redisson/api/RHyperLogLogAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RHyperLogLogAsync.java
rename to redisson/src/main/java/org/redisson/api/RHyperLogLogAsync.java
diff --git a/src/main/java/org/redisson/api/RHyperLogLogReactive.java b/redisson/src/main/java/org/redisson/api/RHyperLogLogReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RHyperLogLogReactive.java
rename to redisson/src/main/java/org/redisson/api/RHyperLogLogReactive.java
diff --git a/src/main/java/org/redisson/api/RKeys.java b/redisson/src/main/java/org/redisson/api/RKeys.java
similarity index 100%
rename from src/main/java/org/redisson/api/RKeys.java
rename to redisson/src/main/java/org/redisson/api/RKeys.java
diff --git a/src/main/java/org/redisson/api/RKeysAsync.java b/redisson/src/main/java/org/redisson/api/RKeysAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RKeysAsync.java
rename to redisson/src/main/java/org/redisson/api/RKeysAsync.java
diff --git a/src/main/java/org/redisson/api/RKeysReactive.java b/redisson/src/main/java/org/redisson/api/RKeysReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RKeysReactive.java
rename to redisson/src/main/java/org/redisson/api/RKeysReactive.java
diff --git a/src/main/java/org/redisson/api/RLexSortedSet.java b/redisson/src/main/java/org/redisson/api/RLexSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLexSortedSet.java
rename to redisson/src/main/java/org/redisson/api/RLexSortedSet.java
diff --git a/src/main/java/org/redisson/api/RLexSortedSetAsync.java b/redisson/src/main/java/org/redisson/api/RLexSortedSetAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLexSortedSetAsync.java
rename to redisson/src/main/java/org/redisson/api/RLexSortedSetAsync.java
diff --git a/src/main/java/org/redisson/api/RLexSortedSetReactive.java b/redisson/src/main/java/org/redisson/api/RLexSortedSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLexSortedSetReactive.java
rename to redisson/src/main/java/org/redisson/api/RLexSortedSetReactive.java
diff --git a/src/main/java/org/redisson/api/RList.java b/redisson/src/main/java/org/redisson/api/RList.java
similarity index 100%
rename from src/main/java/org/redisson/api/RList.java
rename to redisson/src/main/java/org/redisson/api/RList.java
diff --git a/src/main/java/org/redisson/api/RListAsync.java b/redisson/src/main/java/org/redisson/api/RListAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RListAsync.java
rename to redisson/src/main/java/org/redisson/api/RListAsync.java
diff --git a/src/main/java/org/redisson/api/RListMultimap.java b/redisson/src/main/java/org/redisson/api/RListMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/api/RListMultimap.java
rename to redisson/src/main/java/org/redisson/api/RListMultimap.java
diff --git a/src/main/java/org/redisson/api/RListMultimapCache.java b/redisson/src/main/java/org/redisson/api/RListMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/api/RListMultimapCache.java
rename to redisson/src/main/java/org/redisson/api/RListMultimapCache.java
diff --git a/src/main/java/org/redisson/api/RListReactive.java b/redisson/src/main/java/org/redisson/api/RListReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RListReactive.java
rename to redisson/src/main/java/org/redisson/api/RListReactive.java
diff --git a/src/main/java/org/redisson/api/RLiveObject.java b/redisson/src/main/java/org/redisson/api/RLiveObject.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLiveObject.java
rename to redisson/src/main/java/org/redisson/api/RLiveObject.java
diff --git a/src/main/java/org/redisson/api/RLiveObjectService.java b/redisson/src/main/java/org/redisson/api/RLiveObjectService.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLiveObjectService.java
rename to redisson/src/main/java/org/redisson/api/RLiveObjectService.java
diff --git a/src/main/java/org/redisson/api/RLock.java b/redisson/src/main/java/org/redisson/api/RLock.java
similarity index 100%
rename from src/main/java/org/redisson/api/RLock.java
rename to redisson/src/main/java/org/redisson/api/RLock.java
diff --git a/src/main/java/org/redisson/api/RMap.java b/redisson/src/main/java/org/redisson/api/RMap.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMap.java
rename to redisson/src/main/java/org/redisson/api/RMap.java
diff --git a/src/main/java/org/redisson/api/RMapAsync.java b/redisson/src/main/java/org/redisson/api/RMapAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMapAsync.java
rename to redisson/src/main/java/org/redisson/api/RMapAsync.java
diff --git a/src/main/java/org/redisson/api/RMapCache.java b/redisson/src/main/java/org/redisson/api/RMapCache.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMapCache.java
rename to redisson/src/main/java/org/redisson/api/RMapCache.java
diff --git a/src/main/java/org/redisson/api/RMapCacheAsync.java b/redisson/src/main/java/org/redisson/api/RMapCacheAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMapCacheAsync.java
rename to redisson/src/main/java/org/redisson/api/RMapCacheAsync.java
diff --git a/src/main/java/org/redisson/api/RMapCacheReactive.java b/redisson/src/main/java/org/redisson/api/RMapCacheReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMapCacheReactive.java
rename to redisson/src/main/java/org/redisson/api/RMapCacheReactive.java
diff --git a/src/main/java/org/redisson/api/RMapReactive.java b/redisson/src/main/java/org/redisson/api/RMapReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMapReactive.java
rename to redisson/src/main/java/org/redisson/api/RMapReactive.java
diff --git a/src/main/java/org/redisson/api/RMultimap.java b/redisson/src/main/java/org/redisson/api/RMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMultimap.java
rename to redisson/src/main/java/org/redisson/api/RMultimap.java
diff --git a/src/main/java/org/redisson/api/RMultimapAsync.java b/redisson/src/main/java/org/redisson/api/RMultimapAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMultimapAsync.java
rename to redisson/src/main/java/org/redisson/api/RMultimapAsync.java
diff --git a/src/main/java/org/redisson/api/RMultimapCache.java b/redisson/src/main/java/org/redisson/api/RMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMultimapCache.java
rename to redisson/src/main/java/org/redisson/api/RMultimapCache.java
diff --git a/src/main/java/org/redisson/api/RMultimapCacheAsync.java b/redisson/src/main/java/org/redisson/api/RMultimapCacheAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RMultimapCacheAsync.java
rename to redisson/src/main/java/org/redisson/api/RMultimapCacheAsync.java
diff --git a/src/main/java/org/redisson/api/RObject.java b/redisson/src/main/java/org/redisson/api/RObject.java
similarity index 100%
rename from src/main/java/org/redisson/api/RObject.java
rename to redisson/src/main/java/org/redisson/api/RObject.java
diff --git a/src/main/java/org/redisson/api/RObjectAsync.java b/redisson/src/main/java/org/redisson/api/RObjectAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RObjectAsync.java
rename to redisson/src/main/java/org/redisson/api/RObjectAsync.java
diff --git a/src/main/java/org/redisson/api/RObjectReactive.java b/redisson/src/main/java/org/redisson/api/RObjectReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RObjectReactive.java
rename to redisson/src/main/java/org/redisson/api/RObjectReactive.java
diff --git a/src/main/java/org/redisson/api/RPatternTopic.java b/redisson/src/main/java/org/redisson/api/RPatternTopic.java
similarity index 100%
rename from src/main/java/org/redisson/api/RPatternTopic.java
rename to redisson/src/main/java/org/redisson/api/RPatternTopic.java
diff --git a/src/main/java/org/redisson/api/RPatternTopicReactive.java b/redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RPatternTopicReactive.java
rename to redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
diff --git a/src/main/java/org/redisson/api/RQueue.java b/redisson/src/main/java/org/redisson/api/RQueue.java
similarity index 100%
rename from src/main/java/org/redisson/api/RQueue.java
rename to redisson/src/main/java/org/redisson/api/RQueue.java
diff --git a/src/main/java/org/redisson/api/RQueueAsync.java b/redisson/src/main/java/org/redisson/api/RQueueAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RQueueAsync.java
rename to redisson/src/main/java/org/redisson/api/RQueueAsync.java
diff --git a/src/main/java/org/redisson/api/RQueueReactive.java b/redisson/src/main/java/org/redisson/api/RQueueReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RQueueReactive.java
rename to redisson/src/main/java/org/redisson/api/RQueueReactive.java
diff --git a/src/main/java/org/redisson/api/RReadWriteLock.java b/redisson/src/main/java/org/redisson/api/RReadWriteLock.java
similarity index 100%
rename from src/main/java/org/redisson/api/RReadWriteLock.java
rename to redisson/src/main/java/org/redisson/api/RReadWriteLock.java
diff --git a/src/main/java/org/redisson/api/RRemoteService.java b/redisson/src/main/java/org/redisson/api/RRemoteService.java
similarity index 100%
rename from src/main/java/org/redisson/api/RRemoteService.java
rename to redisson/src/main/java/org/redisson/api/RRemoteService.java
diff --git a/src/main/java/org/redisson/api/RScoredSortedSet.java b/redisson/src/main/java/org/redisson/api/RScoredSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScoredSortedSet.java
rename to redisson/src/main/java/org/redisson/api/RScoredSortedSet.java
diff --git a/src/main/java/org/redisson/api/RScoredSortedSetAsync.java b/redisson/src/main/java/org/redisson/api/RScoredSortedSetAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScoredSortedSetAsync.java
rename to redisson/src/main/java/org/redisson/api/RScoredSortedSetAsync.java
diff --git a/src/main/java/org/redisson/api/RScoredSortedSetReactive.java b/redisson/src/main/java/org/redisson/api/RScoredSortedSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScoredSortedSetReactive.java
rename to redisson/src/main/java/org/redisson/api/RScoredSortedSetReactive.java
diff --git a/src/main/java/org/redisson/api/RScript.java b/redisson/src/main/java/org/redisson/api/RScript.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScript.java
rename to redisson/src/main/java/org/redisson/api/RScript.java
diff --git a/src/main/java/org/redisson/api/RScriptAsync.java b/redisson/src/main/java/org/redisson/api/RScriptAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScriptAsync.java
rename to redisson/src/main/java/org/redisson/api/RScriptAsync.java
diff --git a/src/main/java/org/redisson/api/RScriptReactive.java b/redisson/src/main/java/org/redisson/api/RScriptReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RScriptReactive.java
rename to redisson/src/main/java/org/redisson/api/RScriptReactive.java
diff --git a/src/main/java/org/redisson/api/RSemaphore.java b/redisson/src/main/java/org/redisson/api/RSemaphore.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSemaphore.java
rename to redisson/src/main/java/org/redisson/api/RSemaphore.java
diff --git a/src/main/java/org/redisson/api/RSemaphoreAsync.java b/redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSemaphoreAsync.java
rename to redisson/src/main/java/org/redisson/api/RSemaphoreAsync.java
diff --git a/src/main/java/org/redisson/api/RSet.java b/redisson/src/main/java/org/redisson/api/RSet.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSet.java
rename to redisson/src/main/java/org/redisson/api/RSet.java
diff --git a/src/main/java/org/redisson/api/RSetAsync.java b/redisson/src/main/java/org/redisson/api/RSetAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetAsync.java
rename to redisson/src/main/java/org/redisson/api/RSetAsync.java
diff --git a/src/main/java/org/redisson/api/RSetCache.java b/redisson/src/main/java/org/redisson/api/RSetCache.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetCache.java
rename to redisson/src/main/java/org/redisson/api/RSetCache.java
diff --git a/src/main/java/org/redisson/api/RSetCacheAsync.java b/redisson/src/main/java/org/redisson/api/RSetCacheAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetCacheAsync.java
rename to redisson/src/main/java/org/redisson/api/RSetCacheAsync.java
diff --git a/src/main/java/org/redisson/api/RSetCacheReactive.java b/redisson/src/main/java/org/redisson/api/RSetCacheReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetCacheReactive.java
rename to redisson/src/main/java/org/redisson/api/RSetCacheReactive.java
diff --git a/src/main/java/org/redisson/api/RSetMultimap.java b/redisson/src/main/java/org/redisson/api/RSetMultimap.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetMultimap.java
rename to redisson/src/main/java/org/redisson/api/RSetMultimap.java
diff --git a/src/main/java/org/redisson/api/RSetMultimapCache.java b/redisson/src/main/java/org/redisson/api/RSetMultimapCache.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetMultimapCache.java
rename to redisson/src/main/java/org/redisson/api/RSetMultimapCache.java
diff --git a/src/main/java/org/redisson/api/RSetReactive.java b/redisson/src/main/java/org/redisson/api/RSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSetReactive.java
rename to redisson/src/main/java/org/redisson/api/RSetReactive.java
diff --git a/src/main/java/org/redisson/api/RSortedSet.java b/redisson/src/main/java/org/redisson/api/RSortedSet.java
similarity index 100%
rename from src/main/java/org/redisson/api/RSortedSet.java
rename to redisson/src/main/java/org/redisson/api/RSortedSet.java
diff --git a/src/main/java/org/redisson/api/RTopic.java b/redisson/src/main/java/org/redisson/api/RTopic.java
similarity index 100%
rename from src/main/java/org/redisson/api/RTopic.java
rename to redisson/src/main/java/org/redisson/api/RTopic.java
diff --git a/src/main/java/org/redisson/api/RTopicAsync.java b/redisson/src/main/java/org/redisson/api/RTopicAsync.java
similarity index 100%
rename from src/main/java/org/redisson/api/RTopicAsync.java
rename to redisson/src/main/java/org/redisson/api/RTopicAsync.java
diff --git a/src/main/java/org/redisson/api/RTopicReactive.java b/redisson/src/main/java/org/redisson/api/RTopicReactive.java
similarity index 100%
rename from src/main/java/org/redisson/api/RTopicReactive.java
rename to redisson/src/main/java/org/redisson/api/RTopicReactive.java
diff --git a/src/main/java/org/redisson/api/RType.java b/redisson/src/main/java/org/redisson/api/RType.java
similarity index 100%
rename from src/main/java/org/redisson/api/RType.java
rename to redisson/src/main/java/org/redisson/api/RType.java
diff --git a/src/main/java/org/redisson/api/RedissonMultiLock.java b/redisson/src/main/java/org/redisson/api/RedissonMultiLock.java
similarity index 100%
rename from src/main/java/org/redisson/api/RedissonMultiLock.java
rename to redisson/src/main/java/org/redisson/api/RedissonMultiLock.java
diff --git a/src/main/java/org/redisson/api/RedissonReactiveClient.java b/redisson/src/main/java/org/redisson/api/RedissonReactiveClient.java
similarity index 100%
rename from src/main/java/org/redisson/api/RedissonReactiveClient.java
rename to redisson/src/main/java/org/redisson/api/RedissonReactiveClient.java
diff --git a/src/main/java/org/redisson/api/RedissonRedLock.java b/redisson/src/main/java/org/redisson/api/RedissonRedLock.java
similarity index 100%
rename from src/main/java/org/redisson/api/RedissonRedLock.java
rename to redisson/src/main/java/org/redisson/api/RedissonRedLock.java
diff --git a/src/main/java/org/redisson/api/RemoteInvocationOptions.java b/redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java
similarity index 100%
rename from src/main/java/org/redisson/api/RemoteInvocationOptions.java
rename to redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java
diff --git a/src/main/java/org/redisson/api/StatusListener.java b/redisson/src/main/java/org/redisson/api/StatusListener.java
similarity index 100%
rename from src/main/java/org/redisson/api/StatusListener.java
rename to redisson/src/main/java/org/redisson/api/StatusListener.java
diff --git a/src/main/java/org/redisson/api/annotation/RInject.java b/redisson/src/main/java/org/redisson/api/annotation/RInject.java
similarity index 100%
rename from src/main/java/org/redisson/api/annotation/RInject.java
rename to redisson/src/main/java/org/redisson/api/annotation/RInject.java
diff --git a/src/main/java/org/redisson/client/BaseRedisPubSubListener.java b/redisson/src/main/java/org/redisson/client/BaseRedisPubSubListener.java
similarity index 100%
rename from src/main/java/org/redisson/client/BaseRedisPubSubListener.java
rename to redisson/src/main/java/org/redisson/client/BaseRedisPubSubListener.java
diff --git a/src/main/java/org/redisson/client/OneShotPubSubListener.java b/redisson/src/main/java/org/redisson/client/OneShotPubSubListener.java
similarity index 100%
rename from src/main/java/org/redisson/client/OneShotPubSubListener.java
rename to redisson/src/main/java/org/redisson/client/OneShotPubSubListener.java
diff --git a/src/main/java/org/redisson/client/ReconnectListener.java b/redisson/src/main/java/org/redisson/client/ReconnectListener.java
similarity index 100%
rename from src/main/java/org/redisson/client/ReconnectListener.java
rename to redisson/src/main/java/org/redisson/client/ReconnectListener.java
diff --git a/src/main/java/org/redisson/client/RedisAskException.java b/redisson/src/main/java/org/redisson/client/RedisAskException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisAskException.java
rename to redisson/src/main/java/org/redisson/client/RedisAskException.java
diff --git a/src/main/java/org/redisson/client/RedisClient.java b/redisson/src/main/java/org/redisson/client/RedisClient.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisClient.java
rename to redisson/src/main/java/org/redisson/client/RedisClient.java
diff --git a/src/main/java/org/redisson/client/RedisConnection.java b/redisson/src/main/java/org/redisson/client/RedisConnection.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisConnection.java
rename to redisson/src/main/java/org/redisson/client/RedisConnection.java
diff --git a/src/main/java/org/redisson/client/RedisConnectionException.java b/redisson/src/main/java/org/redisson/client/RedisConnectionException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisConnectionException.java
rename to redisson/src/main/java/org/redisson/client/RedisConnectionException.java
diff --git a/src/main/java/org/redisson/client/RedisException.java b/redisson/src/main/java/org/redisson/client/RedisException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisException.java
rename to redisson/src/main/java/org/redisson/client/RedisException.java
diff --git a/src/main/java/org/redisson/client/RedisLoadingException.java b/redisson/src/main/java/org/redisson/client/RedisLoadingException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisLoadingException.java
rename to redisson/src/main/java/org/redisson/client/RedisLoadingException.java
diff --git a/src/main/java/org/redisson/client/RedisMovedException.java b/redisson/src/main/java/org/redisson/client/RedisMovedException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisMovedException.java
rename to redisson/src/main/java/org/redisson/client/RedisMovedException.java
diff --git a/src/main/java/org/redisson/client/RedisNodeNotFoundException.java b/redisson/src/main/java/org/redisson/client/RedisNodeNotFoundException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisNodeNotFoundException.java
rename to redisson/src/main/java/org/redisson/client/RedisNodeNotFoundException.java
diff --git a/src/main/java/org/redisson/client/RedisOutOfMemoryException.java b/redisson/src/main/java/org/redisson/client/RedisOutOfMemoryException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisOutOfMemoryException.java
rename to redisson/src/main/java/org/redisson/client/RedisOutOfMemoryException.java
diff --git a/src/main/java/org/redisson/client/RedisPubSubConnection.java b/redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisPubSubConnection.java
rename to redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java
diff --git a/src/main/java/org/redisson/client/RedisPubSubListener.java b/redisson/src/main/java/org/redisson/client/RedisPubSubListener.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisPubSubListener.java
rename to redisson/src/main/java/org/redisson/client/RedisPubSubListener.java
diff --git a/src/main/java/org/redisson/client/RedisRedirectException.java b/redisson/src/main/java/org/redisson/client/RedisRedirectException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisRedirectException.java
rename to redisson/src/main/java/org/redisson/client/RedisRedirectException.java
diff --git a/src/main/java/org/redisson/client/RedisTimeoutException.java b/redisson/src/main/java/org/redisson/client/RedisTimeoutException.java
similarity index 100%
rename from src/main/java/org/redisson/client/RedisTimeoutException.java
rename to redisson/src/main/java/org/redisson/client/RedisTimeoutException.java
diff --git a/src/main/java/org/redisson/client/SubscribeListener.java b/redisson/src/main/java/org/redisson/client/SubscribeListener.java
similarity index 100%
rename from src/main/java/org/redisson/client/SubscribeListener.java
rename to redisson/src/main/java/org/redisson/client/SubscribeListener.java
diff --git a/src/main/java/org/redisson/client/WriteRedisConnectionException.java b/redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java
similarity index 100%
rename from src/main/java/org/redisson/client/WriteRedisConnectionException.java
rename to redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java
diff --git a/src/main/java/org/redisson/client/codec/BitSetCodec.java b/redisson/src/main/java/org/redisson/client/codec/BitSetCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/BitSetCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/BitSetCodec.java
diff --git a/src/main/java/org/redisson/client/codec/ByteArrayCodec.java b/redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/ByteArrayCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java
diff --git a/src/main/java/org/redisson/client/codec/Codec.java b/redisson/src/main/java/org/redisson/client/codec/Codec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/Codec.java
rename to redisson/src/main/java/org/redisson/client/codec/Codec.java
diff --git a/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java b/redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java
diff --git a/src/main/java/org/redisson/client/codec/DoubleCodec.java b/redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/DoubleCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java
diff --git a/src/main/java/org/redisson/client/codec/GeoEntryCodec.java b/redisson/src/main/java/org/redisson/client/codec/GeoEntryCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/GeoEntryCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/GeoEntryCodec.java
diff --git a/src/main/java/org/redisson/client/codec/IntegerCodec.java b/redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/IntegerCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java
diff --git a/src/main/java/org/redisson/client/codec/JsonJacksonMapValueCodec.java b/redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapValueCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/JsonJacksonMapValueCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapValueCodec.java
diff --git a/src/main/java/org/redisson/client/codec/LongCodec.java b/redisson/src/main/java/org/redisson/client/codec/LongCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/LongCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/LongCodec.java
diff --git a/src/main/java/org/redisson/client/codec/ScanCodec.java b/redisson/src/main/java/org/redisson/client/codec/ScanCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/ScanCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/ScanCodec.java
diff --git a/src/main/java/org/redisson/client/codec/ScoredCodec.java b/redisson/src/main/java/org/redisson/client/codec/ScoredCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/ScoredCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/ScoredCodec.java
diff --git a/src/main/java/org/redisson/client/codec/StringCodec.java b/redisson/src/main/java/org/redisson/client/codec/StringCodec.java
similarity index 100%
rename from src/main/java/org/redisson/client/codec/StringCodec.java
rename to redisson/src/main/java/org/redisson/client/codec/StringCodec.java
diff --git a/src/main/java/org/redisson/client/handler/CommandBatchEncoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandBatchEncoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/CommandBatchEncoder.java
rename to redisson/src/main/java/org/redisson/client/handler/CommandBatchEncoder.java
diff --git a/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/CommandDecoder.java
rename to redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
diff --git a/src/main/java/org/redisson/client/handler/CommandEncoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/CommandEncoder.java
rename to redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java
diff --git a/src/main/java/org/redisson/client/handler/CommandsQueue.java b/redisson/src/main/java/org/redisson/client/handler/CommandsQueue.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/CommandsQueue.java
rename to redisson/src/main/java/org/redisson/client/handler/CommandsQueue.java
diff --git a/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java b/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
rename to redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
diff --git a/src/main/java/org/redisson/client/handler/PubSubKey.java b/redisson/src/main/java/org/redisson/client/handler/PubSubKey.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/PubSubKey.java
rename to redisson/src/main/java/org/redisson/client/handler/PubSubKey.java
diff --git a/src/main/java/org/redisson/client/handler/State.java b/redisson/src/main/java/org/redisson/client/handler/State.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/State.java
rename to redisson/src/main/java/org/redisson/client/handler/State.java
diff --git a/src/main/java/org/redisson/client/handler/StateLevel.java b/redisson/src/main/java/org/redisson/client/handler/StateLevel.java
similarity index 100%
rename from src/main/java/org/redisson/client/handler/StateLevel.java
rename to redisson/src/main/java/org/redisson/client/handler/StateLevel.java
diff --git a/src/main/java/org/redisson/client/protocol/BatchCommandData.java b/redisson/src/main/java/org/redisson/client/protocol/BatchCommandData.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/BatchCommandData.java
rename to redisson/src/main/java/org/redisson/client/protocol/BatchCommandData.java
diff --git a/src/main/java/org/redisson/client/protocol/CommandData.java b/redisson/src/main/java/org/redisson/client/protocol/CommandData.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/CommandData.java
rename to redisson/src/main/java/org/redisson/client/protocol/CommandData.java
diff --git a/src/main/java/org/redisson/client/protocol/CommandsData.java b/redisson/src/main/java/org/redisson/client/protocol/CommandsData.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/CommandsData.java
rename to redisson/src/main/java/org/redisson/client/protocol/CommandsData.java
diff --git a/src/main/java/org/redisson/client/protocol/Decoder.java b/redisson/src/main/java/org/redisson/client/protocol/Decoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/Decoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/Decoder.java
diff --git a/src/main/java/org/redisson/client/protocol/DefaultParamsEncoder.java b/redisson/src/main/java/org/redisson/client/protocol/DefaultParamsEncoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/DefaultParamsEncoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/DefaultParamsEncoder.java
diff --git a/src/main/java/org/redisson/client/protocol/Encoder.java b/redisson/src/main/java/org/redisson/client/protocol/Encoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/Encoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/Encoder.java
diff --git a/src/main/java/org/redisson/client/protocol/QueueCommand.java b/redisson/src/main/java/org/redisson/client/protocol/QueueCommand.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/QueueCommand.java
rename to redisson/src/main/java/org/redisson/client/protocol/QueueCommand.java
diff --git a/src/main/java/org/redisson/client/protocol/QueueCommandHolder.java b/redisson/src/main/java/org/redisson/client/protocol/QueueCommandHolder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/QueueCommandHolder.java
rename to redisson/src/main/java/org/redisson/client/protocol/QueueCommandHolder.java
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommand.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/RedisCommand.java
rename to redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/RedisCommands.java
rename to redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
diff --git a/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java b/redisson/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
rename to redisson/src/main/java/org/redisson/client/protocol/RedisStrictCommand.java
diff --git a/src/main/java/org/redisson/client/protocol/ScoredEntry.java b/redisson/src/main/java/org/redisson/client/protocol/ScoredEntry.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/ScoredEntry.java
rename to redisson/src/main/java/org/redisson/client/protocol/ScoredEntry.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BitSetReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BitSetReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BitSetReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BitSetReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/Convertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/Convertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/KeyValueConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/KeyValueConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/KeyValueConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/KeyValueConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java
rename to redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ClusterNodesDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ClusterNodesDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ClusterNodesDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ClusterNodesDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/DecoderState.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/FlatNestedMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/FlatNestedMultiDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/FlatNestedMultiDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/FlatNestedMultiDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/MultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MultiDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/MultiDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/MultiDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/NestedMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/NestedMultiDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/NestedMultiDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/NestedMultiDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectListReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectListReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectMapDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectMapEntryReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapEntryReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectMapEntryReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapEntryReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ObjectSetReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectSetReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ObjectSetReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectSetReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/Message.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/Message.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/Message.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/Message.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessage.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubMessageDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessage.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubPatternMessageDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusMessage.java
diff --git a/src/main/java/org/redisson/client/protocol/pubsub/PubSubType.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubType.java
similarity index 100%
rename from src/main/java/org/redisson/client/protocol/pubsub/PubSubType.java
rename to redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubType.java
diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionListener.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionListener.java
similarity index 100%
rename from src/main/java/org/redisson/cluster/ClusterConnectionListener.java
rename to redisson/src/main/java/org/redisson/cluster/ClusterConnectionListener.java
diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/cluster/ClusterConnectionManager.java
rename to redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
diff --git a/src/main/java/org/redisson/cluster/ClusterNodeInfo.java b/redisson/src/main/java/org/redisson/cluster/ClusterNodeInfo.java
similarity index 100%
rename from src/main/java/org/redisson/cluster/ClusterNodeInfo.java
rename to redisson/src/main/java/org/redisson/cluster/ClusterNodeInfo.java
diff --git a/src/main/java/org/redisson/cluster/ClusterPartition.java b/redisson/src/main/java/org/redisson/cluster/ClusterPartition.java
similarity index 100%
rename from src/main/java/org/redisson/cluster/ClusterPartition.java
rename to redisson/src/main/java/org/redisson/cluster/ClusterPartition.java
diff --git a/src/main/java/org/redisson/cluster/ClusterSlotRange.java b/redisson/src/main/java/org/redisson/cluster/ClusterSlotRange.java
similarity index 100%
rename from src/main/java/org/redisson/cluster/ClusterSlotRange.java
rename to redisson/src/main/java/org/redisson/cluster/ClusterSlotRange.java
diff --git a/src/main/java/org/redisson/codec/AvroJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/AvroJacksonCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/AvroJacksonCodec.java
rename to redisson/src/main/java/org/redisson/codec/AvroJacksonCodec.java
diff --git a/src/main/java/org/redisson/codec/CborJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/CborJacksonCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/CborJacksonCodec.java
rename to redisson/src/main/java/org/redisson/codec/CborJacksonCodec.java
diff --git a/src/main/java/org/redisson/codec/CustomObjectInputStream.java b/redisson/src/main/java/org/redisson/codec/CustomObjectInputStream.java
similarity index 100%
rename from src/main/java/org/redisson/codec/CustomObjectInputStream.java
rename to redisson/src/main/java/org/redisson/codec/CustomObjectInputStream.java
diff --git a/src/main/java/org/redisson/codec/FstCodec.java b/redisson/src/main/java/org/redisson/codec/FstCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/FstCodec.java
rename to redisson/src/main/java/org/redisson/codec/FstCodec.java
diff --git a/src/main/java/org/redisson/codec/JsonJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/JsonJacksonCodec.java
rename to redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java
diff --git a/src/main/java/org/redisson/codec/KryoCodec.java b/redisson/src/main/java/org/redisson/codec/KryoCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/KryoCodec.java
rename to redisson/src/main/java/org/redisson/codec/KryoCodec.java
diff --git a/src/main/java/org/redisson/codec/LZ4Codec.java b/redisson/src/main/java/org/redisson/codec/LZ4Codec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/LZ4Codec.java
rename to redisson/src/main/java/org/redisson/codec/LZ4Codec.java
diff --git a/src/main/java/org/redisson/codec/MsgPackJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/MsgPackJacksonCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/MsgPackJacksonCodec.java
rename to redisson/src/main/java/org/redisson/codec/MsgPackJacksonCodec.java
diff --git a/src/main/java/org/redisson/codec/SerializationCodec.java b/redisson/src/main/java/org/redisson/codec/SerializationCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/SerializationCodec.java
rename to redisson/src/main/java/org/redisson/codec/SerializationCodec.java
diff --git a/src/main/java/org/redisson/codec/SmileJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/SmileJacksonCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/SmileJacksonCodec.java
rename to redisson/src/main/java/org/redisson/codec/SmileJacksonCodec.java
diff --git a/src/main/java/org/redisson/codec/SnappyCodec.java b/redisson/src/main/java/org/redisson/codec/SnappyCodec.java
similarity index 100%
rename from src/main/java/org/redisson/codec/SnappyCodec.java
rename to redisson/src/main/java/org/redisson/codec/SnappyCodec.java
diff --git a/src/main/java/org/redisson/command/AsyncDetails.java b/redisson/src/main/java/org/redisson/command/AsyncDetails.java
similarity index 100%
rename from src/main/java/org/redisson/command/AsyncDetails.java
rename to redisson/src/main/java/org/redisson/command/AsyncDetails.java
diff --git a/src/main/java/org/redisson/command/CommandAsyncExecutor.java b/redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandAsyncExecutor.java
rename to redisson/src/main/java/org/redisson/command/CommandAsyncExecutor.java
diff --git a/src/main/java/org/redisson/command/CommandAsyncService.java b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandAsyncService.java
rename to redisson/src/main/java/org/redisson/command/CommandAsyncService.java
diff --git a/src/main/java/org/redisson/command/CommandBatchService.java b/redisson/src/main/java/org/redisson/command/CommandBatchService.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandBatchService.java
rename to redisson/src/main/java/org/redisson/command/CommandBatchService.java
diff --git a/src/main/java/org/redisson/command/CommandExecutor.java b/redisson/src/main/java/org/redisson/command/CommandExecutor.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandExecutor.java
rename to redisson/src/main/java/org/redisson/command/CommandExecutor.java
diff --git a/src/main/java/org/redisson/command/CommandReactiveExecutor.java b/redisson/src/main/java/org/redisson/command/CommandReactiveExecutor.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandReactiveExecutor.java
rename to redisson/src/main/java/org/redisson/command/CommandReactiveExecutor.java
diff --git a/src/main/java/org/redisson/command/CommandReactiveService.java b/redisson/src/main/java/org/redisson/command/CommandReactiveService.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandReactiveService.java
rename to redisson/src/main/java/org/redisson/command/CommandReactiveService.java
diff --git a/src/main/java/org/redisson/command/CommandSyncExecutor.java b/redisson/src/main/java/org/redisson/command/CommandSyncExecutor.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandSyncExecutor.java
rename to redisson/src/main/java/org/redisson/command/CommandSyncExecutor.java
diff --git a/src/main/java/org/redisson/command/CommandSyncService.java b/redisson/src/main/java/org/redisson/command/CommandSyncService.java
similarity index 100%
rename from src/main/java/org/redisson/command/CommandSyncService.java
rename to redisson/src/main/java/org/redisson/command/CommandSyncService.java
diff --git a/src/main/java/org/redisson/config/BaseConfig.java b/redisson/src/main/java/org/redisson/config/BaseConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/BaseConfig.java
rename to redisson/src/main/java/org/redisson/config/BaseConfig.java
diff --git a/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java b/redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java
rename to redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java
diff --git a/src/main/java/org/redisson/config/ClusterServersConfig.java b/redisson/src/main/java/org/redisson/config/ClusterServersConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/ClusterServersConfig.java
rename to redisson/src/main/java/org/redisson/config/ClusterServersConfig.java
diff --git a/src/main/java/org/redisson/config/Config.java b/redisson/src/main/java/org/redisson/config/Config.java
similarity index 100%
rename from src/main/java/org/redisson/config/Config.java
rename to redisson/src/main/java/org/redisson/config/Config.java
diff --git a/src/main/java/org/redisson/config/ConfigSupport.java b/redisson/src/main/java/org/redisson/config/ConfigSupport.java
similarity index 100%
rename from src/main/java/org/redisson/config/ConfigSupport.java
rename to redisson/src/main/java/org/redisson/config/ConfigSupport.java
diff --git a/src/main/java/org/redisson/config/ElasticacheServersConfig.java b/redisson/src/main/java/org/redisson/config/ElasticacheServersConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/ElasticacheServersConfig.java
rename to redisson/src/main/java/org/redisson/config/ElasticacheServersConfig.java
diff --git a/src/main/java/org/redisson/config/MasterSlaveServersConfig.java b/redisson/src/main/java/org/redisson/config/MasterSlaveServersConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/MasterSlaveServersConfig.java
rename to redisson/src/main/java/org/redisson/config/MasterSlaveServersConfig.java
diff --git a/src/main/java/org/redisson/config/ReadMode.java b/redisson/src/main/java/org/redisson/config/ReadMode.java
similarity index 100%
rename from src/main/java/org/redisson/config/ReadMode.java
rename to redisson/src/main/java/org/redisson/config/ReadMode.java
diff --git a/src/main/java/org/redisson/config/RedissonNodeConfig.java b/redisson/src/main/java/org/redisson/config/RedissonNodeConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/RedissonNodeConfig.java
rename to redisson/src/main/java/org/redisson/config/RedissonNodeConfig.java
diff --git a/src/main/java/org/redisson/config/SentinelServersConfig.java b/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/SentinelServersConfig.java
rename to redisson/src/main/java/org/redisson/config/SentinelServersConfig.java
diff --git a/src/main/java/org/redisson/config/SingleServerConfig.java b/redisson/src/main/java/org/redisson/config/SingleServerConfig.java
similarity index 100%
rename from src/main/java/org/redisson/config/SingleServerConfig.java
rename to redisson/src/main/java/org/redisson/config/SingleServerConfig.java
diff --git a/src/main/java/org/redisson/connection/CRC16.java b/redisson/src/main/java/org/redisson/connection/CRC16.java
similarity index 100%
rename from src/main/java/org/redisson/connection/CRC16.java
rename to redisson/src/main/java/org/redisson/connection/CRC16.java
diff --git a/src/main/java/org/redisson/connection/ClientConnectionsEntry.java b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ClientConnectionsEntry.java
rename to redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java
diff --git a/src/main/java/org/redisson/connection/ConnectionEventsHub.java b/redisson/src/main/java/org/redisson/connection/ConnectionEventsHub.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ConnectionEventsHub.java
rename to redisson/src/main/java/org/redisson/connection/ConnectionEventsHub.java
diff --git a/src/main/java/org/redisson/connection/ConnectionInitializer.java b/redisson/src/main/java/org/redisson/connection/ConnectionInitializer.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ConnectionInitializer.java
rename to redisson/src/main/java/org/redisson/connection/ConnectionInitializer.java
diff --git a/src/main/java/org/redisson/connection/ConnectionListener.java b/redisson/src/main/java/org/redisson/connection/ConnectionListener.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ConnectionListener.java
rename to redisson/src/main/java/org/redisson/connection/ConnectionListener.java
diff --git a/src/main/java/org/redisson/connection/ConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ConnectionManager.java
rename to redisson/src/main/java/org/redisson/connection/ConnectionManager.java
diff --git a/src/main/java/org/redisson/connection/DefaultConnectionListener.java b/redisson/src/main/java/org/redisson/connection/DefaultConnectionListener.java
similarity index 100%
rename from src/main/java/org/redisson/connection/DefaultConnectionListener.java
rename to redisson/src/main/java/org/redisson/connection/DefaultConnectionListener.java
diff --git a/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/ElasticacheConnectionManager.java
rename to redisson/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java
diff --git a/src/main/java/org/redisson/connection/FutureConnectionListener.java b/redisson/src/main/java/org/redisson/connection/FutureConnectionListener.java
similarity index 100%
rename from src/main/java/org/redisson/connection/FutureConnectionListener.java
rename to redisson/src/main/java/org/redisson/connection/FutureConnectionListener.java
diff --git a/src/main/java/org/redisson/connection/IdleConnectionWatcher.java b/redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java
similarity index 100%
rename from src/main/java/org/redisson/connection/IdleConnectionWatcher.java
rename to redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java
diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
rename to redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
diff --git a/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java
similarity index 100%
rename from src/main/java/org/redisson/connection/MasterSlaveEntry.java
rename to redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java
diff --git a/src/main/java/org/redisson/connection/NodeSource.java b/redisson/src/main/java/org/redisson/connection/NodeSource.java
similarity index 100%
rename from src/main/java/org/redisson/connection/NodeSource.java
rename to redisson/src/main/java/org/redisson/connection/NodeSource.java
diff --git a/src/main/java/org/redisson/connection/PubSubConnectionEntry.java b/redisson/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
similarity index 100%
rename from src/main/java/org/redisson/connection/PubSubConnectionEntry.java
rename to redisson/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
diff --git a/src/main/java/org/redisson/connection/RedisClientEntry.java b/redisson/src/main/java/org/redisson/connection/RedisClientEntry.java
similarity index 100%
rename from src/main/java/org/redisson/connection/RedisClientEntry.java
rename to redisson/src/main/java/org/redisson/connection/RedisClientEntry.java
diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/SentinelConnectionManager.java
rename to redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
diff --git a/src/main/java/org/redisson/connection/SingleConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/SingleConnectionManager.java
rename to redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
diff --git a/src/main/java/org/redisson/connection/SingleEntry.java b/redisson/src/main/java/org/redisson/connection/SingleEntry.java
similarity index 100%
rename from src/main/java/org/redisson/connection/SingleEntry.java
rename to redisson/src/main/java/org/redisson/connection/SingleEntry.java
diff --git a/src/main/java/org/redisson/connection/balancer/LoadBalancer.java b/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancer.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/LoadBalancer.java
rename to redisson/src/main/java/org/redisson/connection/balancer/LoadBalancer.java
diff --git a/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java b/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
rename to redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
diff --git a/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java b/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java
rename to redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java
diff --git a/src/main/java/org/redisson/connection/balancer/RandomLoadBalancer.java b/redisson/src/main/java/org/redisson/connection/balancer/RandomLoadBalancer.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/RandomLoadBalancer.java
rename to redisson/src/main/java/org/redisson/connection/balancer/RandomLoadBalancer.java
diff --git a/src/main/java/org/redisson/connection/balancer/RoundRobinLoadBalancer.java b/redisson/src/main/java/org/redisson/connection/balancer/RoundRobinLoadBalancer.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/RoundRobinLoadBalancer.java
rename to redisson/src/main/java/org/redisson/connection/balancer/RoundRobinLoadBalancer.java
diff --git a/src/main/java/org/redisson/connection/balancer/WeightedRoundRobinBalancer.java b/redisson/src/main/java/org/redisson/connection/balancer/WeightedRoundRobinBalancer.java
similarity index 100%
rename from src/main/java/org/redisson/connection/balancer/WeightedRoundRobinBalancer.java
rename to redisson/src/main/java/org/redisson/connection/balancer/WeightedRoundRobinBalancer.java
diff --git a/src/main/java/org/redisson/connection/decoder/CacheGetAllDecoder.java b/redisson/src/main/java/org/redisson/connection/decoder/CacheGetAllDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/connection/decoder/CacheGetAllDecoder.java
rename to redisson/src/main/java/org/redisson/connection/decoder/CacheGetAllDecoder.java
diff --git a/src/main/java/org/redisson/connection/decoder/ListDrainToDecoder.java b/redisson/src/main/java/org/redisson/connection/decoder/ListDrainToDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/connection/decoder/ListDrainToDecoder.java
rename to redisson/src/main/java/org/redisson/connection/decoder/ListDrainToDecoder.java
diff --git a/src/main/java/org/redisson/connection/decoder/ListFirstObjectDecoder.java b/redisson/src/main/java/org/redisson/connection/decoder/ListFirstObjectDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/connection/decoder/ListFirstObjectDecoder.java
rename to redisson/src/main/java/org/redisson/connection/decoder/ListFirstObjectDecoder.java
diff --git a/src/main/java/org/redisson/connection/decoder/MapGetAllDecoder.java b/redisson/src/main/java/org/redisson/connection/decoder/MapGetAllDecoder.java
similarity index 100%
rename from src/main/java/org/redisson/connection/decoder/MapGetAllDecoder.java
rename to redisson/src/main/java/org/redisson/connection/decoder/MapGetAllDecoder.java
diff --git a/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
similarity index 100%
rename from src/main/java/org/redisson/connection/pool/ConnectionPool.java
rename to redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
diff --git a/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java
similarity index 100%
rename from src/main/java/org/redisson/connection/pool/MasterConnectionPool.java
rename to redisson/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java
diff --git a/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java
similarity index 100%
rename from src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java
rename to redisson/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java
diff --git a/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java
similarity index 100%
rename from src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java
rename to redisson/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java
diff --git a/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java
similarity index 100%
rename from src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java
rename to redisson/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java
diff --git a/src/main/java/org/redisson/executor/ClassLoaderDelegator.java b/redisson/src/main/java/org/redisson/executor/ClassLoaderDelegator.java
similarity index 100%
rename from src/main/java/org/redisson/executor/ClassLoaderDelegator.java
rename to redisson/src/main/java/org/redisson/executor/ClassLoaderDelegator.java
diff --git a/src/main/java/org/redisson/executor/ExecutorRemoteService.java b/redisson/src/main/java/org/redisson/executor/ExecutorRemoteService.java
similarity index 100%
rename from src/main/java/org/redisson/executor/ExecutorRemoteService.java
rename to redisson/src/main/java/org/redisson/executor/ExecutorRemoteService.java
diff --git a/src/main/java/org/redisson/executor/RedissonClassLoader.java b/redisson/src/main/java/org/redisson/executor/RedissonClassLoader.java
similarity index 100%
rename from src/main/java/org/redisson/executor/RedissonClassLoader.java
rename to redisson/src/main/java/org/redisson/executor/RedissonClassLoader.java
diff --git a/src/main/java/org/redisson/executor/RemoteExecutorService.java b/redisson/src/main/java/org/redisson/executor/RemoteExecutorService.java
similarity index 100%
rename from src/main/java/org/redisson/executor/RemoteExecutorService.java
rename to redisson/src/main/java/org/redisson/executor/RemoteExecutorService.java
diff --git a/src/main/java/org/redisson/executor/RemoteExecutorServiceAsync.java b/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceAsync.java
similarity index 100%
rename from src/main/java/org/redisson/executor/RemoteExecutorServiceAsync.java
rename to redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceAsync.java
diff --git a/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java b/redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java
similarity index 100%
rename from src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java
rename to redisson/src/main/java/org/redisson/executor/RemoteExecutorServiceImpl.java
diff --git a/src/main/java/org/redisson/executor/RemotePromise.java b/redisson/src/main/java/org/redisson/executor/RemotePromise.java
similarity index 100%
rename from src/main/java/org/redisson/executor/RemotePromise.java
rename to redisson/src/main/java/org/redisson/executor/RemotePromise.java
diff --git a/src/main/java/org/redisson/liveobject/LiveObjectTemplate.java b/redisson/src/main/java/org/redisson/liveobject/LiveObjectTemplate.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/LiveObjectTemplate.java
rename to redisson/src/main/java/org/redisson/liveobject/LiveObjectTemplate.java
diff --git a/src/main/java/org/redisson/liveobject/annotation/REntity.java b/redisson/src/main/java/org/redisson/liveobject/annotation/REntity.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/annotation/REntity.java
rename to redisson/src/main/java/org/redisson/liveobject/annotation/REntity.java
diff --git a/src/main/java/org/redisson/liveobject/annotation/RId.java b/redisson/src/main/java/org/redisson/liveobject/annotation/RId.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/annotation/RId.java
rename to redisson/src/main/java/org/redisson/liveobject/annotation/RId.java
diff --git a/src/main/java/org/redisson/liveobject/annotation/RObjectField.java b/redisson/src/main/java/org/redisson/liveobject/annotation/RObjectField.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/annotation/RObjectField.java
rename to redisson/src/main/java/org/redisson/liveobject/annotation/RObjectField.java
diff --git a/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java
rename to redisson/src/main/java/org/redisson/liveobject/core/AccessorInterceptor.java
diff --git a/src/main/java/org/redisson/liveobject/core/ExpirableInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/ExpirableInterceptor.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/core/ExpirableInterceptor.java
rename to redisson/src/main/java/org/redisson/liveobject/core/ExpirableInterceptor.java
diff --git a/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java
rename to redisson/src/main/java/org/redisson/liveobject/core/LiveObjectInterceptor.java
diff --git a/src/main/java/org/redisson/liveobject/misc/Introspectior.java b/redisson/src/main/java/org/redisson/liveobject/misc/Introspectior.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/misc/Introspectior.java
rename to redisson/src/main/java/org/redisson/liveobject/misc/Introspectior.java
diff --git a/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java b/redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java
rename to redisson/src/main/java/org/redisson/liveobject/misc/RedissonObjectFactory.java
diff --git a/src/main/java/org/redisson/liveobject/provider/CodecProvider.java b/redisson/src/main/java/org/redisson/liveobject/provider/CodecProvider.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/provider/CodecProvider.java
rename to redisson/src/main/java/org/redisson/liveobject/provider/CodecProvider.java
diff --git a/src/main/java/org/redisson/liveobject/provider/DefaultCodecProvider.java b/redisson/src/main/java/org/redisson/liveobject/provider/DefaultCodecProvider.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/provider/DefaultCodecProvider.java
rename to redisson/src/main/java/org/redisson/liveobject/provider/DefaultCodecProvider.java
diff --git a/src/main/java/org/redisson/liveobject/provider/DefaultResolverProvider.java b/redisson/src/main/java/org/redisson/liveobject/provider/DefaultResolverProvider.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/provider/DefaultResolverProvider.java
rename to redisson/src/main/java/org/redisson/liveobject/provider/DefaultResolverProvider.java
diff --git a/src/main/java/org/redisson/liveobject/provider/ResolverProvider.java b/redisson/src/main/java/org/redisson/liveobject/provider/ResolverProvider.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/provider/ResolverProvider.java
rename to redisson/src/main/java/org/redisson/liveobject/provider/ResolverProvider.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/AbstractNamingScheme.java b/redisson/src/main/java/org/redisson/liveobject/resolver/AbstractNamingScheme.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/AbstractNamingScheme.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/AbstractNamingScheme.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/DefaultNamingScheme.java b/redisson/src/main/java/org/redisson/liveobject/resolver/DefaultNamingScheme.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/DefaultNamingScheme.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/DefaultNamingScheme.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java b/redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/DistributedAtomicLongIdGenerator.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/NamingScheme.java b/redisson/src/main/java/org/redisson/liveobject/resolver/NamingScheme.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/NamingScheme.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/NamingScheme.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java b/redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/RIdResolver.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/RIdResolver.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java b/redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/RandomUUIDIdStringGenerator.java
diff --git a/src/main/java/org/redisson/liveobject/resolver/Resolver.java b/redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java
similarity index 100%
rename from src/main/java/org/redisson/liveobject/resolver/Resolver.java
rename to redisson/src/main/java/org/redisson/liveobject/resolver/Resolver.java
diff --git a/src/main/java/org/redisson/misc/CompositeIterable.java b/redisson/src/main/java/org/redisson/misc/CompositeIterable.java
similarity index 100%
rename from src/main/java/org/redisson/misc/CompositeIterable.java
rename to redisson/src/main/java/org/redisson/misc/CompositeIterable.java
diff --git a/src/main/java/org/redisson/misc/Hash.java b/redisson/src/main/java/org/redisson/misc/Hash.java
similarity index 100%
rename from src/main/java/org/redisson/misc/Hash.java
rename to redisson/src/main/java/org/redisson/misc/Hash.java
diff --git a/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java b/redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java
similarity index 100%
rename from src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java
rename to redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java
diff --git a/src/main/java/org/redisson/misc/PromiseDelegator.java b/redisson/src/main/java/org/redisson/misc/PromiseDelegator.java
similarity index 100%
rename from src/main/java/org/redisson/misc/PromiseDelegator.java
rename to redisson/src/main/java/org/redisson/misc/PromiseDelegator.java
diff --git a/src/main/java/org/redisson/misc/ReclosableLatch.java b/redisson/src/main/java/org/redisson/misc/ReclosableLatch.java
similarity index 100%
rename from src/main/java/org/redisson/misc/ReclosableLatch.java
rename to redisson/src/main/java/org/redisson/misc/ReclosableLatch.java
diff --git a/src/main/java/org/redisson/misc/URIBuilder.java b/redisson/src/main/java/org/redisson/misc/URIBuilder.java
similarity index 100%
rename from src/main/java/org/redisson/misc/URIBuilder.java
rename to redisson/src/main/java/org/redisson/misc/URIBuilder.java
diff --git a/src/main/java/org/redisson/pubsub/AsyncSemaphore.java b/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/AsyncSemaphore.java
rename to redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java
diff --git a/src/main/java/org/redisson/pubsub/CountDownLatchPubSub.java b/redisson/src/main/java/org/redisson/pubsub/CountDownLatchPubSub.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/CountDownLatchPubSub.java
rename to redisson/src/main/java/org/redisson/pubsub/CountDownLatchPubSub.java
diff --git a/src/main/java/org/redisson/pubsub/LockPubSub.java b/redisson/src/main/java/org/redisson/pubsub/LockPubSub.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/LockPubSub.java
rename to redisson/src/main/java/org/redisson/pubsub/LockPubSub.java
diff --git a/src/main/java/org/redisson/pubsub/PublishSubscribe.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/PublishSubscribe.java
rename to redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java
diff --git a/src/main/java/org/redisson/pubsub/SemaphorePubSub.java b/redisson/src/main/java/org/redisson/pubsub/SemaphorePubSub.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/SemaphorePubSub.java
rename to redisson/src/main/java/org/redisson/pubsub/SemaphorePubSub.java
diff --git a/src/main/java/org/redisson/pubsub/TransferListener.java b/redisson/src/main/java/org/redisson/pubsub/TransferListener.java
similarity index 100%
rename from src/main/java/org/redisson/pubsub/TransferListener.java
rename to redisson/src/main/java/org/redisson/pubsub/TransferListener.java
diff --git a/src/main/java/org/redisson/reactive/NettyFuturePublisher.java b/redisson/src/main/java/org/redisson/reactive/NettyFuturePublisher.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/NettyFuturePublisher.java
rename to redisson/src/main/java/org/redisson/reactive/NettyFuturePublisher.java
diff --git a/src/main/java/org/redisson/reactive/PublisherAdder.java b/redisson/src/main/java/org/redisson/reactive/PublisherAdder.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/PublisherAdder.java
rename to redisson/src/main/java/org/redisson/reactive/PublisherAdder.java
diff --git a/src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonAtomicLongReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonBatchReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonBatchReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonBitSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonBitSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonBitSetReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonBitSetReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonBucketReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonBucketReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonBucketReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonBucketReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonDequeReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonDequeReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonDequeReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonDequeReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonExpirableReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonExpirableReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonExpirableReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonExpirableReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonHyperLogLogReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonKeysReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonKeysReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonListReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonListReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonMapReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonMapReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java b/redisson/src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonMapReactiveIterator.java
diff --git a/src/main/java/org/redisson/reactive/RedissonObjectReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonObjectReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonObjectReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonObjectReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonPatternTopicReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonQueueReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonQueueReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonQueueReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonQueueReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonScriptReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonScriptReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonScriptReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonScriptReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonSetReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java
diff --git a/src/main/java/org/redisson/reactive/RedissonTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/RedissonTopicReactive.java
rename to redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java
diff --git a/src/main/java/org/redisson/reactive/SetReactiveIterator.java b/redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java
similarity index 100%
rename from src/main/java/org/redisson/reactive/SetReactiveIterator.java
rename to redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java
diff --git a/src/main/java/org/redisson/remote/RRemoteAsync.java b/redisson/src/main/java/org/redisson/remote/RRemoteAsync.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RRemoteAsync.java
rename to redisson/src/main/java/org/redisson/remote/RRemoteAsync.java
diff --git a/src/main/java/org/redisson/remote/RRemoteServiceResponse.java b/redisson/src/main/java/org/redisson/remote/RRemoteServiceResponse.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RRemoteServiceResponse.java
rename to redisson/src/main/java/org/redisson/remote/RRemoteServiceResponse.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceAck.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceAck.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceAck.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceAck.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceAckTimeoutException.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceAckTimeoutException.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceAckTimeoutException.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceAckTimeoutException.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceKey.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceKey.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceMethod.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceMethod.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceMethod.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceMethod.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceRequest.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceRequest.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceRequest.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceRequest.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceResponse.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceResponse.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceResponse.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceResponse.java
diff --git a/src/main/java/org/redisson/remote/RemoteServiceTimeoutException.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceTimeoutException.java
similarity index 100%
rename from src/main/java/org/redisson/remote/RemoteServiceTimeoutException.java
rename to redisson/src/main/java/org/redisson/remote/RemoteServiceTimeoutException.java
diff --git a/src/main/java/org/redisson/spring/cache/CacheConfig.java b/redisson/src/main/java/org/redisson/spring/cache/CacheConfig.java
similarity index 100%
rename from src/main/java/org/redisson/spring/cache/CacheConfig.java
rename to redisson/src/main/java/org/redisson/spring/cache/CacheConfig.java
diff --git a/src/main/java/org/redisson/spring/cache/CacheConfigSupport.java b/redisson/src/main/java/org/redisson/spring/cache/CacheConfigSupport.java
similarity index 100%
rename from src/main/java/org/redisson/spring/cache/CacheConfigSupport.java
rename to redisson/src/main/java/org/redisson/spring/cache/CacheConfigSupport.java
diff --git a/src/main/java/org/redisson/spring/cache/NullValue.java b/redisson/src/main/java/org/redisson/spring/cache/NullValue.java
similarity index 100%
rename from src/main/java/org/redisson/spring/cache/NullValue.java
rename to redisson/src/main/java/org/redisson/spring/cache/NullValue.java
diff --git a/src/main/java/org/redisson/spring/cache/RedissonCache.java b/redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java
similarity index 100%
rename from src/main/java/org/redisson/spring/cache/RedissonCache.java
rename to redisson/src/main/java/org/redisson/spring/cache/RedissonCache.java
diff --git a/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java b/redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java
similarity index 100%
rename from src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java
rename to redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java
diff --git a/src/test/java/org/redisson/BaseConcurrentTest.java b/redisson/src/test/java/org/redisson/BaseConcurrentTest.java
similarity index 100%
rename from src/test/java/org/redisson/BaseConcurrentTest.java
rename to redisson/src/test/java/org/redisson/BaseConcurrentTest.java
diff --git a/src/test/java/org/redisson/BaseReactiveTest.java b/redisson/src/test/java/org/redisson/BaseReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/BaseReactiveTest.java
rename to redisson/src/test/java/org/redisson/BaseReactiveTest.java
diff --git a/src/test/java/org/redisson/BaseTest.java b/redisson/src/test/java/org/redisson/BaseTest.java
similarity index 100%
rename from src/test/java/org/redisson/BaseTest.java
rename to redisson/src/test/java/org/redisson/BaseTest.java
diff --git a/src/test/java/org/redisson/CommandHandlersTest.java b/redisson/src/test/java/org/redisson/CommandHandlersTest.java
similarity index 100%
rename from src/test/java/org/redisson/CommandHandlersTest.java
rename to redisson/src/test/java/org/redisson/CommandHandlersTest.java
diff --git a/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java b/redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java
rename to redisson/src/test/java/org/redisson/ConcurrentRedissonSortedSetTest.java
diff --git a/src/test/java/org/redisson/ErrorsCodec.java b/redisson/src/test/java/org/redisson/ErrorsCodec.java
similarity index 100%
rename from src/test/java/org/redisson/ErrorsCodec.java
rename to redisson/src/test/java/org/redisson/ErrorsCodec.java
diff --git a/src/test/java/org/redisson/RedisClientTest.java b/redisson/src/test/java/org/redisson/RedisClientTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedisClientTest.java
rename to redisson/src/test/java/org/redisson/RedisClientTest.java
diff --git a/src/test/java/org/redisson/RedisRunner.java b/redisson/src/test/java/org/redisson/RedisRunner.java
similarity index 100%
rename from src/test/java/org/redisson/RedisRunner.java
rename to redisson/src/test/java/org/redisson/RedisRunner.java
diff --git a/src/test/java/org/redisson/RedisVersion.java b/redisson/src/test/java/org/redisson/RedisVersion.java
similarity index 100%
rename from src/test/java/org/redisson/RedisVersion.java
rename to redisson/src/test/java/org/redisson/RedisVersion.java
diff --git a/src/test/java/org/redisson/RedissonAtomicDoubleTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonAtomicDoubleTest.java
rename to redisson/src/test/java/org/redisson/RedissonAtomicDoubleTest.java
diff --git a/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonAtomicLongReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonAtomicLongTest.java b/redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonAtomicLongTest.java
rename to redisson/src/test/java/org/redisson/RedissonAtomicLongTest.java
diff --git a/src/test/java/org/redisson/RedissonBatchTest.java b/redisson/src/test/java/org/redisson/RedissonBatchTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBatchTest.java
rename to redisson/src/test/java/org/redisson/RedissonBatchTest.java
diff --git a/src/test/java/org/redisson/RedissonBitSetReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonBitSetReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBitSetReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonBitSetReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonBitSetTest.java b/redisson/src/test/java/org/redisson/RedissonBitSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBitSetTest.java
rename to redisson/src/test/java/org/redisson/RedissonBitSetTest.java
diff --git a/src/test/java/org/redisson/RedissonBlockingDequeTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingDequeTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBlockingDequeTest.java
rename to redisson/src/test/java/org/redisson/RedissonBlockingDequeTest.java
diff --git a/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonBlockingQueueReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBlockingQueueTest.java
rename to redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
diff --git a/src/test/java/org/redisson/RedissonBloomFilterTest.java b/redisson/src/test/java/org/redisson/RedissonBloomFilterTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBloomFilterTest.java
rename to redisson/src/test/java/org/redisson/RedissonBloomFilterTest.java
diff --git a/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
rename to redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
diff --git a/src/test/java/org/redisson/RedissonBucketReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonBucketReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBucketReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonBucketReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonBucketTest.java b/redisson/src/test/java/org/redisson/RedissonBucketTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBucketTest.java
rename to redisson/src/test/java/org/redisson/RedissonBucketTest.java
diff --git a/src/test/java/org/redisson/RedissonBucketsTest.java b/redisson/src/test/java/org/redisson/RedissonBucketsTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonBucketsTest.java
rename to redisson/src/test/java/org/redisson/RedissonBucketsTest.java
diff --git a/src/test/java/org/redisson/RedissonCodecTest.java b/redisson/src/test/java/org/redisson/RedissonCodecTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonCodecTest.java
rename to redisson/src/test/java/org/redisson/RedissonCodecTest.java
diff --git a/src/test/java/org/redisson/RedissonConcurrentMapTest.java b/redisson/src/test/java/org/redisson/RedissonConcurrentMapTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonConcurrentMapTest.java
rename to redisson/src/test/java/org/redisson/RedissonConcurrentMapTest.java
diff --git a/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java b/redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
rename to redisson/src/test/java/org/redisson/RedissonCountDownLatchConcurrentTest.java
diff --git a/src/test/java/org/redisson/RedissonCountDownLatchTest.java b/redisson/src/test/java/org/redisson/RedissonCountDownLatchTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonCountDownLatchTest.java
rename to redisson/src/test/java/org/redisson/RedissonCountDownLatchTest.java
diff --git a/src/test/java/org/redisson/RedissonDequeReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonDequeReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonDequeReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonDequeReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonDequeTest.java b/redisson/src/test/java/org/redisson/RedissonDequeTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonDequeTest.java
rename to redisson/src/test/java/org/redisson/RedissonDequeTest.java
diff --git a/src/test/java/org/redisson/RedissonFairLockTest.java b/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonFairLockTest.java
rename to redisson/src/test/java/org/redisson/RedissonFairLockTest.java
diff --git a/src/test/java/org/redisson/RedissonGeoTest.java b/redisson/src/test/java/org/redisson/RedissonGeoTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonGeoTest.java
rename to redisson/src/test/java/org/redisson/RedissonGeoTest.java
diff --git a/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonHyperLogLogReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonHyperLogLogTest.java b/redisson/src/test/java/org/redisson/RedissonHyperLogLogTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonHyperLogLogTest.java
rename to redisson/src/test/java/org/redisson/RedissonHyperLogLogTest.java
diff --git a/src/test/java/org/redisson/RedissonKeysReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonKeysReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonKeysReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonKeysReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonKeysTest.java b/redisson/src/test/java/org/redisson/RedissonKeysTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonKeysTest.java
rename to redisson/src/test/java/org/redisson/RedissonKeysTest.java
diff --git a/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonLexSortedSetReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonLexSortedSetTest.java b/redisson/src/test/java/org/redisson/RedissonLexSortedSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonLexSortedSetTest.java
rename to redisson/src/test/java/org/redisson/RedissonLexSortedSetTest.java
diff --git a/src/test/java/org/redisson/RedissonListMultimapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonListMultimapCacheTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonListMultimapCacheTest.java
rename to redisson/src/test/java/org/redisson/RedissonListMultimapCacheTest.java
diff --git a/src/test/java/org/redisson/RedissonListMultimapTest.java b/redisson/src/test/java/org/redisson/RedissonListMultimapTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonListMultimapTest.java
rename to redisson/src/test/java/org/redisson/RedissonListMultimapTest.java
diff --git a/src/test/java/org/redisson/RedissonListReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonListReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonListReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonListReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonListTest.java b/redisson/src/test/java/org/redisson/RedissonListTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonListTest.java
rename to redisson/src/test/java/org/redisson/RedissonListTest.java
diff --git a/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java b/redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonLiveObjectServiceTest.java
rename to redisson/src/test/java/org/redisson/RedissonLiveObjectServiceTest.java
diff --git a/src/test/java/org/redisson/RedissonLockHeavyTest.java b/redisson/src/test/java/org/redisson/RedissonLockHeavyTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonLockHeavyTest.java
rename to redisson/src/test/java/org/redisson/RedissonLockHeavyTest.java
diff --git a/src/test/java/org/redisson/RedissonLockTest.java b/redisson/src/test/java/org/redisson/RedissonLockTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonLockTest.java
rename to redisson/src/test/java/org/redisson/RedissonLockTest.java
diff --git a/src/test/java/org/redisson/RedissonMapCacheReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonMapCacheReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonMapCacheReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonMapCacheReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonMapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonMapCacheTest.java
rename to redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
diff --git a/src/test/java/org/redisson/RedissonMapReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonMapReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonMapReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonMapReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonMapTest.java b/redisson/src/test/java/org/redisson/RedissonMapTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonMapTest.java
rename to redisson/src/test/java/org/redisson/RedissonMapTest.java
diff --git a/src/test/java/org/redisson/RedissonMultiLockTest.java b/redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonMultiLockTest.java
rename to redisson/src/test/java/org/redisson/RedissonMultiLockTest.java
diff --git a/src/test/java/org/redisson/RedissonQueueReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonQueueReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonQueueReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonQueueReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonQueueTest.java b/redisson/src/test/java/org/redisson/RedissonQueueTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonQueueTest.java
rename to redisson/src/test/java/org/redisson/RedissonQueueTest.java
diff --git a/src/test/java/org/redisson/RedissonReadWriteLockTest.java b/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonReadWriteLockTest.java
rename to redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
diff --git a/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonRedLockTest.java
rename to redisson/src/test/java/org/redisson/RedissonRedLockTest.java
diff --git a/src/test/java/org/redisson/RedissonRemoteServiceTest.java b/redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonRemoteServiceTest.java
rename to redisson/src/test/java/org/redisson/RedissonRemoteServiceTest.java
diff --git a/src/test/java/org/redisson/RedissonRunnable.java b/redisson/src/test/java/org/redisson/RedissonRunnable.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonRunnable.java
rename to redisson/src/test/java/org/redisson/RedissonRunnable.java
diff --git a/src/test/java/org/redisson/RedissonRuntimeEnvironment.java b/redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonRuntimeEnvironment.java
rename to redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java
diff --git a/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonScoredSortedSetReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonScoredSortedSetTest.java b/redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonScoredSortedSetTest.java
rename to redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java
diff --git a/src/test/java/org/redisson/RedissonScriptReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonScriptReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonScriptReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonScriptReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonScriptTest.java b/redisson/src/test/java/org/redisson/RedissonScriptTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonScriptTest.java
rename to redisson/src/test/java/org/redisson/RedissonScriptTest.java
diff --git a/src/test/java/org/redisson/RedissonSemaphoreTest.java b/redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSemaphoreTest.java
rename to redisson/src/test/java/org/redisson/RedissonSemaphoreTest.java
diff --git a/src/test/java/org/redisson/RedissonSetCacheReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonSetCacheReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetCacheReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetCacheReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonSetCacheTest.java b/redisson/src/test/java/org/redisson/RedissonSetCacheTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetCacheTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetCacheTest.java
diff --git a/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetMultimapCacheTest.java
diff --git a/src/test/java/org/redisson/RedissonSetMultimapTest.java b/redisson/src/test/java/org/redisson/RedissonSetMultimapTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetMultimapTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetMultimapTest.java
diff --git a/src/test/java/org/redisson/RedissonSetReactiveTest.java b/redisson/src/test/java/org/redisson/RedissonSetReactiveTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetReactiveTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetReactiveTest.java
diff --git a/src/test/java/org/redisson/RedissonSetTest.java b/redisson/src/test/java/org/redisson/RedissonSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSetTest.java
rename to redisson/src/test/java/org/redisson/RedissonSetTest.java
diff --git a/src/test/java/org/redisson/RedissonSortedSetTest.java b/redisson/src/test/java/org/redisson/RedissonSortedSetTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonSortedSetTest.java
rename to redisson/src/test/java/org/redisson/RedissonSortedSetTest.java
diff --git a/src/test/java/org/redisson/RedissonTest.java b/redisson/src/test/java/org/redisson/RedissonTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonTest.java
rename to redisson/src/test/java/org/redisson/RedissonTest.java
diff --git a/src/test/java/org/redisson/RedissonTestRunListener.java b/redisson/src/test/java/org/redisson/RedissonTestRunListener.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonTestRunListener.java
rename to redisson/src/test/java/org/redisson/RedissonTestRunListener.java
diff --git a/src/test/java/org/redisson/RedissonTopicPatternTest.java b/redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonTopicPatternTest.java
rename to redisson/src/test/java/org/redisson/RedissonTopicPatternTest.java
diff --git a/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonTopicTest.java
rename to redisson/src/test/java/org/redisson/RedissonTopicTest.java
diff --git a/src/test/java/org/redisson/RedissonTwoLockedThread.java b/redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
similarity index 100%
rename from src/test/java/org/redisson/RedissonTwoLockedThread.java
rename to redisson/src/test/java/org/redisson/RedissonTwoLockedThread.java
diff --git a/src/test/java/org/redisson/TestObject.java b/redisson/src/test/java/org/redisson/TestObject.java
similarity index 100%
rename from src/test/java/org/redisson/TestObject.java
rename to redisson/src/test/java/org/redisson/TestObject.java
diff --git a/src/test/java/org/redisson/TimeoutTest.java b/redisson/src/test/java/org/redisson/TimeoutTest.java
similarity index 100%
rename from src/test/java/org/redisson/TimeoutTest.java
rename to redisson/src/test/java/org/redisson/TimeoutTest.java
diff --git a/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java b/redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
similarity index 100%
rename from src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
rename to redisson/src/test/java/org/redisson/client/codec/JsonJacksonMapValueCodecTest.java
diff --git a/src/test/java/org/redisson/executor/CallableRedissonTask.java b/redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java
similarity index 100%
rename from src/test/java/org/redisson/executor/CallableRedissonTask.java
rename to redisson/src/test/java/org/redisson/executor/CallableRedissonTask.java
diff --git a/src/test/java/org/redisson/executor/CallableTask.java b/redisson/src/test/java/org/redisson/executor/CallableTask.java
similarity index 100%
rename from src/test/java/org/redisson/executor/CallableTask.java
rename to redisson/src/test/java/org/redisson/executor/CallableTask.java
diff --git a/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
similarity index 100%
rename from src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
rename to redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
diff --git a/src/test/java/org/redisson/executor/RunnableRedissonTask.java b/redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java
similarity index 100%
rename from src/test/java/org/redisson/executor/RunnableRedissonTask.java
rename to redisson/src/test/java/org/redisson/executor/RunnableRedissonTask.java
diff --git a/src/test/java/org/redisson/executor/RunnableTask.java b/redisson/src/test/java/org/redisson/executor/RunnableTask.java
similarity index 100%
rename from src/test/java/org/redisson/executor/RunnableTask.java
rename to redisson/src/test/java/org/redisson/executor/RunnableTask.java
diff --git a/src/test/java/org/redisson/executor/RunnableTask2.java b/redisson/src/test/java/org/redisson/executor/RunnableTask2.java
similarity index 100%
rename from src/test/java/org/redisson/executor/RunnableTask2.java
rename to redisson/src/test/java/org/redisson/executor/RunnableTask2.java
diff --git a/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java b/redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
similarity index 100%
rename from src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
rename to redisson/src/test/java/org/redisson/spring/cache/RedissonSpringCacheTest.java
diff --git a/src/test/resources/logback.xml b/redisson/src/test/resources/logback.xml
similarity index 100%
rename from src/test/resources/logback.xml
rename to redisson/src/test/resources/logback.xml
diff --git a/src/test/resources/org/redisson/spring/cache/cache-config.json b/redisson/src/test/resources/org/redisson/spring/cache/cache-config.json
similarity index 100%
rename from src/test/resources/org/redisson/spring/cache/cache-config.json
rename to redisson/src/test/resources/org/redisson/spring/cache/cache-config.json
diff --git a/src/test/resources/redis_connectionListener_test.conf b/redisson/src/test/resources/redis_connectionListener_test.conf
similarity index 100%
rename from src/test/resources/redis_connectionListener_test.conf
rename to redisson/src/test/resources/redis_connectionListener_test.conf
diff --git a/src/test/resources/redis_multiLock_test_instance1.conf b/redisson/src/test/resources/redis_multiLock_test_instance1.conf
similarity index 100%
rename from src/test/resources/redis_multiLock_test_instance1.conf
rename to redisson/src/test/resources/redis_multiLock_test_instance1.conf
diff --git a/src/test/resources/redis_multiLock_test_instance2.conf b/redisson/src/test/resources/redis_multiLock_test_instance2.conf
similarity index 100%
rename from src/test/resources/redis_multiLock_test_instance2.conf
rename to redisson/src/test/resources/redis_multiLock_test_instance2.conf
diff --git a/src/test/resources/redis_multiLock_test_instance3.conf b/redisson/src/test/resources/redis_multiLock_test_instance3.conf
similarity index 100%
rename from src/test/resources/redis_multiLock_test_instance3.conf
rename to redisson/src/test/resources/redis_multiLock_test_instance3.conf
diff --git a/src/test/resources/redis_oom_test.conf b/redisson/src/test/resources/redis_oom_test.conf
similarity index 100%
rename from src/test/resources/redis_oom_test.conf
rename to redisson/src/test/resources/redis_oom_test.conf