diff --git a/pom.xml b/pom.xml
index 1fa7f11..8ce2593 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,9 +56,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.github.nkzawa</groupId>
+      <groupId>io.socket</groupId>
       <artifactId>engine.io-client</artifactId>
-      <version>0.6.0</version>
+      <version>0.6.1</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
diff --git a/src/main/java/io/socket/client/Manager.java b/src/main/java/io/socket/client/Manager.java
index a0de70b..c4169d7 100644
--- a/src/main/java/io/socket/client/Manager.java
+++ b/src/main/java/io/socket/client/Manager.java
@@ -1,10 +1,10 @@
 package io.socket.client;
 
 import io.socket.backo.Backoff;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.parser.Packet;
 import io.socket.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.thread.EventThread;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -14,7 +14,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
 /**
  * Manager class represents a connection to a given Socket.IO server.
  */
@@ -90,7 +89,7 @@ public class Manager extends Emitter {
     private List<Packet> packetBuffer;
     private Queue<On.Handle> subs;
     private Options opts;
-    /*package*/ com.github.nkzawa.engineio.client.Socket engine;
+    /*package*/ io.socket.engineio.client.Socket engine;
     private Parser.Encoder encoder;
     private Parser.Decoder decoder;
 
@@ -252,7 +251,7 @@ public class Manager extends Emitter {
 
                 logger.fine(String.format("opening %s", Manager.this.uri));
                 Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
-                final com.github.nkzawa.engineio.client.Socket socket = Manager.this.engine;
+                final io.socket.engineio.client.Socket socket = Manager.this.engine;
                 final Manager self = Manager.this;
                 Manager.this.readyState = ReadyState.OPENING;
                 Manager.this.skipReconnect = false;
@@ -338,7 +337,7 @@ public class Manager extends Emitter {
         this.readyState = ReadyState.OPEN;
         this.emit(EVENT_OPEN);
 
-        final com.github.nkzawa.engineio.client.Socket socket = this.engine;
+        final io.socket.engineio.client.Socket socket = this.engine;
         this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() {
             @Override
             public void call(Object... objects) {
@@ -558,14 +557,14 @@ public class Manager extends Emitter {
     }
 
 
-    private static class Engine extends com.github.nkzawa.engineio.client.Socket {
+    private static class Engine extends io.socket.engineio.client.Socket {
 
         Engine(URI uri, Options opts) {
             super(uri, opts);
         }
     }
 
-    public static class Options extends com.github.nkzawa.engineio.client.Socket.Options {
+    public static class Options extends io.socket.engineio.client.Socket.Options {
 
         public boolean reconnection = true;
         public int reconnectionAttempts;
diff --git a/src/main/java/io/socket/client/On.java b/src/main/java/io/socket/client/On.java
index f529f14..b962f13 100644
--- a/src/main/java/io/socket/client/On.java
+++ b/src/main/java/io/socket/client/On.java
@@ -1,6 +1,6 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 
 public class On {
 
diff --git a/src/main/java/io/socket/client/Socket.java b/src/main/java/io/socket/client/Socket.java
index e0ae22d..88f897e 100644
--- a/src/main/java/io/socket/client/Socket.java
+++ b/src/main/java/io/socket/client/Socket.java
@@ -1,10 +1,10 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.hasbinary.HasBinary;
 import io.socket.parser.Packet;
 import io.socket.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.thread.EventThread;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/main/java/io/socket/parser/Parser.java b/src/main/java/io/socket/parser/Parser.java
index 2333b7f..806c00c 100644
--- a/src/main/java/io/socket/parser/Parser.java
+++ b/src/main/java/io/socket/parser/Parser.java
@@ -1,6 +1,6 @@
 package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONException;
 import org.json.JSONTokener;
 
diff --git a/src/test/java/io/socket/client/ConnectionTest.java b/src/test/java/io/socket/client/ConnectionTest.java
index a3e7a15..034733a 100644
--- a/src/test/java/io/socket/client/ConnectionTest.java
+++ b/src/test/java/io/socket/client/ConnectionTest.java
@@ -1,6 +1,6 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
diff --git a/src/test/java/io/socket/client/SSLConnectionTest.java b/src/test/java/io/socket/client/SSLConnectionTest.java
index fcba017..e4585c5 100644
--- a/src/test/java/io/socket/client/SSLConnectionTest.java
+++ b/src/test/java/io/socket/client/SSLConnectionTest.java
@@ -1,6 +1,6 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/io/socket/client/ServerConnectionTest.java b/src/test/java/io/socket/client/ServerConnectionTest.java
index eed9d2f..6c421a1 100644
--- a/src/test/java/io/socket/client/ServerConnectionTest.java
+++ b/src/test/java/io/socket/client/ServerConnectionTest.java
@@ -1,9 +1,9 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Transport;
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Transport;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.WebSocket;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -195,7 +195,7 @@ public class ServerConnectionTest extends Connection {
         socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
             @Override
             public void call(Object... args) {
-                socket.io().engine.on(com.github.nkzawa.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
+                socket.io().engine.on(io.socket.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
                     @Override
                     public void call(Object... objects) {
                         values.offer("done");
diff --git a/src/test/java/io/socket/client/SocketTest.java b/src/test/java/io/socket/client/SocketTest.java
index a9f7b23..800ae1f 100644
--- a/src/test/java/io/socket/client/SocketTest.java
+++ b/src/test/java/io/socket/client/SocketTest.java
@@ -1,6 +1,6 @@
 package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/io/socket/client/executions/Connection.java b/src/test/java/io/socket/client/executions/Connection.java
index 6ae60a1..1d1a8c8 100644
--- a/src/test/java/io/socket/client/executions/Connection.java
+++ b/src/test/java/io/socket/client/executions/Connection.java
@@ -1,6 +1,6 @@
 package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 
diff --git a/src/test/java/io/socket/client/executions/ConnectionFailure.java b/src/test/java/io/socket/client/executions/ConnectionFailure.java
index 1568cc3..92c9b3b 100644
--- a/src/test/java/io/socket/client/executions/ConnectionFailure.java
+++ b/src/test/java/io/socket/client/executions/ConnectionFailure.java
@@ -1,6 +1,6 @@
 package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 
diff --git a/src/test/java/io/socket/client/executions/ImmediateClose.java b/src/test/java/io/socket/client/executions/ImmediateClose.java
index 554eb16..1e889fd 100644
--- a/src/test/java/io/socket/client/executions/ImmediateClose.java
+++ b/src/test/java/io/socket/client/executions/ImmediateClose.java
@@ -1,6 +1,6 @@
 package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 
diff --git a/src/test/java/io/socket/parser/ByteArrayTest.java b/src/test/java/io/socket/parser/ByteArrayTest.java
index f5d6786..5154cec 100644
--- a/src/test/java/io/socket/parser/ByteArrayTest.java
+++ b/src/test/java/io/socket/parser/ByteArrayTest.java
@@ -1,6 +1,6 @@
 package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/test/java/io/socket/parser/Helpers.java b/src/test/java/io/socket/parser/Helpers.java
index a5a5d1e..365969c 100644
--- a/src/test/java/io/socket/parser/Helpers.java
+++ b/src/test/java/io/socket/parser/Helpers.java
@@ -1,6 +1,6 @@
 package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;