diff --git a/src/main/java/com/corundumstudio/socketio/store/MemoryStoreFactory.java b/src/main/java/com/corundumstudio/socketio/store/MemoryStoreFactory.java
index be7b03d..7abae7e 100644
--- a/src/main/java/com/corundumstudio/socketio/store/MemoryStoreFactory.java
+++ b/src/main/java/com/corundumstudio/socketio/store/MemoryStoreFactory.java
@@ -19,7 +19,6 @@ import java.util.UUID;
 
 import com.corundumstudio.socketio.Store;
 import com.corundumstudio.socketio.store.pubsub.BaseStoreFactory;
-import com.corundumstudio.socketio.store.pubsub.PubSubMemoryStore;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 
 public class MemoryStoreFactory extends BaseStoreFactory {
diff --git a/src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubMemoryStore.java b/src/main/java/com/corundumstudio/socketio/store/PubSubMemoryStore.java
similarity index 80%
rename from src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubMemoryStore.java
rename to src/main/java/com/corundumstudio/socketio/store/PubSubMemoryStore.java
index 5e6a82d..71028e5 100644
--- a/src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubMemoryStore.java
+++ b/src/main/java/com/corundumstudio/socketio/store/PubSubMemoryStore.java
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.corundumstudio.socketio.store.pubsub;
+package com.corundumstudio.socketio.store;
+
+import com.corundumstudio.socketio.store.pubsub.PubSubListener;
+import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
+import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 
 public class PubSubMemoryStore implements PubSubStore {
 
diff --git a/src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubRedisStore.java b/src/main/java/com/corundumstudio/socketio/store/PubSubRedisStore.java
similarity index 95%
rename from src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubRedisStore.java
rename to src/main/java/com/corundumstudio/socketio/store/PubSubRedisStore.java
index 382510d..5d0b0ec 100644
--- a/src/main/java/com/corundumstudio/socketio/store/pubsub/PubSubRedisStore.java
+++ b/src/main/java/com/corundumstudio/socketio/store/PubSubRedisStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.corundumstudio.socketio.store.pubsub;
+package com.corundumstudio.socketio.store;
 
 import java.io.IOException;
 import java.util.Queue;
@@ -33,6 +33,9 @@ import redis.clients.jedis.JedisPubSub;
 
 import com.corundumstudio.socketio.handler.SocketIOException;
 import com.corundumstudio.socketio.parser.JsonSupport;
+import com.corundumstudio.socketio.store.pubsub.PubSubListener;
+import com.corundumstudio.socketio.store.pubsub.PubSubMessage;
+import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 
 public class PubSubRedisStore implements PubSubStore {
 
diff --git a/src/main/java/com/corundumstudio/socketio/store/RedisStoreFactory.java b/src/main/java/com/corundumstudio/socketio/store/RedisStoreFactory.java
index 976340e..ceff87e 100644
--- a/src/main/java/com/corundumstudio/socketio/store/RedisStoreFactory.java
+++ b/src/main/java/com/corundumstudio/socketio/store/RedisStoreFactory.java
@@ -23,7 +23,6 @@ import com.corundumstudio.socketio.Store;
 import com.corundumstudio.socketio.namespace.NamespacesHub;
 import com.corundumstudio.socketio.parser.JsonSupport;
 import com.corundumstudio.socketio.store.pubsub.BaseStoreFactory;
-import com.corundumstudio.socketio.store.pubsub.PubSubRedisStore;
 import com.corundumstudio.socketio.store.pubsub.PubSubStore;
 import com.corundumstudio.socketio.transport.MainBaseClient;