diff --git a/History.md b/History.md
index df4d900..79097c9 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+0.6.1 / 2015-08-31
+==================
+
+* change package name to "io.socket"
+
 0.6.0 / 2015-08-09
 ==================
 
diff --git a/README.md b/README.md
index fc30575..13b3248 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-# Engine.IO-client.java
-[![Build Status](https://travis-ci.org/nkzawa/engine.io-client.java.png?branch=master)](https://travis-ci.org/nkzawa/engine.io-client.java)
+# Engine.IO-client Java
+[![Build Status](https://travis-ci.org/socketio/engine.io-client-java.png?branch=master)](https://travis-ci.org/socketio/engine.io-client-java)
 
-This is the Engine.IO Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/LearnBoost/engine.io-client).
+This is the Engine.IO Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/engine.io-client).
 
-See also: [Socket.IO-client.java](https://github.com/nkzawa/socket.io-client.java)
+See also: [Socket.IO-client Java](https://github.com/socketio/socket.io-client-java)
 
 ## Installation
-The latest artifact is available on Maven Central. To install manually, please refer dependencies to [pom.xml](https://github.com/nkzawa/engine.io-client.java/blob/master/pom.xml).
+The latest artifact is available on Maven Central. To install manually, please refer [dependencies](https://socketio.github.io/engine.io-client-java/dependencies.html).
 
 ### Maven
 Add the following dependency to your `pom.xml`.
@@ -14,9 +14,9 @@ Add the following dependency to your `pom.xml`.
 ```xml
 <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>
 </dependencies>
 ```
@@ -25,11 +25,11 @@ Add the following dependency to your `pom.xml`.
 Add it as a gradle dependency for Android Studio, in `build.gradle`:
 
 ```groovy
-compile 'com.github.nkzawa:engine.io-client:0.6.0'
+compile 'io.socket:engine.io-client:0.6.1'
 ```
 
 ## Usage
-Engine.IO-client.java has the similar api with the JS client. You can use `Socket` to connect:
+Engine.IO-client Java has the similar api with the JS client. You can use `Socket` to connect:
 
 ```java
 socket = new Socket("ws://localhost");
@@ -136,7 +136,7 @@ socket.on(Socket.EVENT_TRANSPORT, new Emitter.listener() {
 
 See the Javadoc for more details.
 
-http://nkzawa.github.io/engine.io-client.java/apidocs/
+http://socketio.github.io/engine.io-client-java/apidocs/
 
 ## License
 
diff --git a/pom.xml b/pom.xml
index cfbb7e3..cf4057f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.nkzawa</groupId>
+  <groupId>io.socket</groupId>
   <artifactId>engine.io-client</artifactId>
-  <version>0.6.1-SNAPSHOT</version>
+  <version>0.6.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>engine.io-client</name>
   <description>Engine.IO Client Library for Java</description>
-  <url>https://github.com/nkzawa/engine.io-client.java</url>
+  <url>https://github.com/socketio/engine.io-client-java</url>
 
   <parent>
     <groupId>org.sonatype.oss</groupId>
@@ -27,9 +27,9 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/nkzawa/engine.io-client.java</url>
-    <connection>scm:git:git://github.com/nkzawa/engine.io-client.java.git</connection>
-    <developerConnection>scm:git:git@github.com:nkzawa/engine.io-client.java.git</developerConnection>
+    <url>https://github.com/socketio/engine.io-client-java</url>
+    <connection>scm:git:git://github.com/socketio/engine.io-client-java.git</connection>
+    <developerConnection>scm:git:git@github.com:socketio/engine.io-client-java.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
diff --git a/src/main/java/com/github/nkzawa/emitter/Emitter.java b/src/main/java/io/socket/emitter/Emitter.java
similarity index 99%
rename from src/main/java/com/github/nkzawa/emitter/Emitter.java
rename to src/main/java/io/socket/emitter/Emitter.java
index a681dd4..a95e2d5 100644
--- a/src/main/java/com/github/nkzawa/emitter/Emitter.java
+++ b/src/main/java/io/socket/emitter/Emitter.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.emitter;
+package io.socket.emitter;
 
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java b/src/main/java/io/socket/engineio/client/EngineIOException.java
similarity index 90%
rename from src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java
rename to src/main/java/io/socket/engineio/client/EngineIOException.java
index 8fb77d3..fe5f791 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java
+++ b/src/main/java/io/socket/engineio/client/EngineIOException.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
 public class EngineIOException extends Exception {
 
diff --git a/src/main/java/com/github/nkzawa/engineio/client/HandshakeData.java b/src/main/java/io/socket/engineio/client/HandshakeData.java
similarity index 95%
rename from src/main/java/com/github/nkzawa/engineio/client/HandshakeData.java
rename to src/main/java/io/socket/engineio/client/HandshakeData.java
index 4cb9f57..348270f 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/HandshakeData.java
+++ b/src/main/java/io/socket/engineio/client/HandshakeData.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
 
 import org.json.JSONArray;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/Socket.java b/src/main/java/io/socket/engineio/client/Socket.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/engineio/client/Socket.java
rename to src/main/java/io/socket/engineio/client/Socket.java
index 45b1c84..f8fc989 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/Socket.java
+++ b/src/main/java/io/socket/engineio/client/Socket.java
@@ -1,13 +1,13 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.PollingXHR;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
-import com.github.nkzawa.engineio.parser.Packet;
-import com.github.nkzawa.engineio.parser.Parser;
-import com.github.nkzawa.parseqs.ParseQS;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.PollingXHR;
+import io.socket.engineio.client.transports.WebSocket;
+import io.socket.engineio.parser.Packet;
+import io.socket.engineio.parser.Parser;
+import io.socket.parseqs.ParseQS;
+import io.socket.thread.EventThread;
 import org.json.JSONException;
 
 import javax.net.ssl.HostnameVerifier;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/Transport.java b/src/main/java/io/socket/engineio/client/Transport.java
similarity index 94%
rename from src/main/java/com/github/nkzawa/engineio/client/Transport.java
rename to src/main/java/io/socket/engineio/client/Transport.java
index 2e12bad..eda3d82 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/Transport.java
+++ b/src/main/java/io/socket/engineio/client/Transport.java
@@ -1,10 +1,10 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.parser.Packet;
-import com.github.nkzawa.engineio.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.parser.Packet;
+import io.socket.engineio.parser.Parser;
+import io.socket.thread.EventThread;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java b/src/main/java/io/socket/engineio/client/transports/Polling.java
similarity index 93%
rename from src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java
rename to src/main/java/io/socket/engineio/client/transports/Polling.java
index 5fe520b..e010214 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java
+++ b/src/main/java/io/socket/engineio/client/transports/Polling.java
@@ -1,11 +1,12 @@
-package com.github.nkzawa.engineio.client.transports;
+package io.socket.engineio.client.transports;
 
 
-import com.github.nkzawa.engineio.client.Transport;
-import com.github.nkzawa.engineio.parser.Packet;
-import com.github.nkzawa.engineio.parser.Parser;
-import com.github.nkzawa.parseqs.ParseQS;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.engineio.client.Transport;
+import io.socket.engineio.parser.Packet;
+import io.socket.engineio.parser.Parser;
+import io.socket.parseqs.ParseQS;
+import io.socket.thread.EventThread;
+import io.socket.emitter.Emitter;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -56,7 +57,7 @@ abstract public class Polling extends Transport {
                     if (Polling.this.polling) {
                         logger.fine("we are currently polling - waiting to pause");
                         total[0]++;
-                        Polling.this.once(EVENT_POLL_COMPLETE, new Listener() {
+                        Polling.this.once(EVENT_POLL_COMPLETE, new Emitter.Listener() {
                             @Override
                             public void call(Object... args) {
                                 logger.fine("pre-pause polling complete");
@@ -70,7 +71,7 @@ abstract public class Polling extends Transport {
                     if (!Polling.this.writable) {
                         logger.fine("we are currently writing - waiting to pause");
                         total[0]++;
-                        Polling.this.once(EVENT_DRAIN, new Listener() {
+                        Polling.this.once(EVENT_DRAIN, new Emitter.Listener() {
                             @Override
                             public void call(Object... args) {
                                 logger.fine("pre-pause writing complete");
@@ -147,7 +148,7 @@ abstract public class Polling extends Transport {
     protected void doClose() {
         final Polling self = this;
 
-        Listener close = new Listener() {
+        Emitter.Listener close = new Emitter.Listener() {
             @Override
             public void call(Object... args) {
                 logger.fine("writing close packet");
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java
similarity index 93%
rename from src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
rename to src/main/java/io/socket/engineio/client/transports/PollingXHR.java
index 6eb8dcf..17074db 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
+++ b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java
@@ -1,8 +1,9 @@
-package com.github.nkzawa.engineio.client.transports;
+package io.socket.engineio.client.transports;
 
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.thread.EventThread;
+import io.socket.engineio.client.Transport;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -21,7 +22,7 @@ public class PollingXHR extends Polling {
     private Request sendXhr;
     private Request pollXhr;
 
-    public PollingXHR(Options opts) {
+    public PollingXHR(Transport.Options opts) {
         super(opts);
     }
 
@@ -40,19 +41,19 @@ public class PollingXHR extends Polling {
         Request req = new Request(opts);
 
         final PollingXHR self = this;
-        req.on(Request.EVENT_REQUEST_HEADERS, new Listener() {
+        req.on(Request.EVENT_REQUEST_HEADERS, new Emitter.Listener() {
             @Override
             public void call(Object... args) {
                 // Never execute asynchronously for support to modify headers.
-                self.emit(EVENT_REQUEST_HEADERS, args[0]);
+                self.emit(Transport.EVENT_REQUEST_HEADERS, args[0]);
             }
-        }).on(Request.EVENT_RESPONSE_HEADERS, new Listener() {
+        }).on(Request.EVENT_RESPONSE_HEADERS, new Emitter.Listener() {
             @Override
             public void call(final Object... args) {
                 EventThread.exec(new Runnable() {
                     @Override
                     public void run() {
-                        self.emit(EVENT_RESPONSE_HEADERS, args[0]);
+                        self.emit(Transport.EVENT_RESPONSE_HEADERS, args[0]);
                     }
                 });
             }
@@ -67,7 +68,7 @@ public class PollingXHR extends Polling {
         opts.data = data;
         Request req = this.request(opts);
         final PollingXHR self = this;
-        req.on(Request.EVENT_SUCCESS, new Listener() {
+        req.on(Request.EVENT_SUCCESS, new Emitter.Listener() {
             @Override
             public void call(Object... args) {
                 EventThread.exec(new Runnable() {
@@ -78,7 +79,7 @@ public class PollingXHR extends Polling {
                 });
             }
         });
-        req.on(Request.EVENT_ERROR, new Listener() {
+        req.on(Request.EVENT_ERROR, new Emitter.Listener() {
             @Override
             public void call(final Object... args) {
                 EventThread.exec(new Runnable() {
@@ -99,7 +100,7 @@ public class PollingXHR extends Polling {
         logger.fine("xhr poll");
         Request req = this.request();
         final PollingXHR self = this;
-        req.on(Request.EVENT_DATA, new Listener() {
+        req.on(Request.EVENT_DATA, new Emitter.Listener() {
             @Override
             public void call(final Object... args) {
                 EventThread.exec(new Runnable() {
@@ -115,7 +116,7 @@ public class PollingXHR extends Polling {
                 });
             }
         });
-        req.on(Request.EVENT_ERROR, new Listener() {
+        req.on(Request.EVENT_ERROR, new Emitter.Listener() {
             @Override
             public void call(final Object... args) {
                 EventThread.exec(new Runnable() {
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java b/src/main/java/io/socket/engineio/client/transports/WebSocket.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
rename to src/main/java/io/socket/engineio/client/transports/WebSocket.java
index 0937c90..330df11 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
+++ b/src/main/java/io/socket/engineio/client/transports/WebSocket.java
@@ -1,11 +1,11 @@
-package com.github.nkzawa.engineio.client.transports;
+package io.socket.engineio.client.transports;
 
 
-import com.github.nkzawa.engineio.client.Transport;
-import com.github.nkzawa.engineio.parser.Packet;
-import com.github.nkzawa.engineio.parser.Parser;
-import com.github.nkzawa.parseqs.ParseQS;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.engineio.client.Transport;
+import io.socket.engineio.parser.Packet;
+import io.socket.engineio.parser.Parser;
+import io.socket.parseqs.ParseQS;
+import io.socket.thread.EventThread;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
diff --git a/src/main/java/com/github/nkzawa/engineio/parser/Packet.java b/src/main/java/io/socket/engineio/parser/Packet.java
similarity index 93%
rename from src/main/java/com/github/nkzawa/engineio/parser/Packet.java
rename to src/main/java/io/socket/engineio/parser/Packet.java
index 29d5b74..32e2e4d 100644
--- a/src/main/java/com/github/nkzawa/engineio/parser/Packet.java
+++ b/src/main/java/io/socket/engineio/parser/Packet.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.parser;
+package io.socket.engineio.parser;
 
 
 public class Packet<T> {
diff --git a/src/main/java/com/github/nkzawa/engineio/parser/Parser.java b/src/main/java/io/socket/engineio/parser/Parser.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/engineio/parser/Parser.java
rename to src/main/java/io/socket/engineio/parser/Parser.java
index 04e0117..bad33a0 100644
--- a/src/main/java/com/github/nkzawa/engineio/parser/Parser.java
+++ b/src/main/java/io/socket/engineio/parser/Parser.java
@@ -1,8 +1,8 @@
-package com.github.nkzawa.engineio.parser;
+package io.socket.engineio.parser;
 
 
-import com.github.nkzawa.utf8.UTF8;
-import com.github.nkzawa.utf8.UTF8Exception;
+import io.socket.utf8.UTF8;
+import io.socket.utf8.UTF8Exception;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/main/java/com/github/nkzawa/global/Global.java b/src/main/java/io/socket/global/Global.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/global/Global.java
rename to src/main/java/io/socket/global/Global.java
index 62396ce..3275187 100644
--- a/src/main/java/com/github/nkzawa/global/Global.java
+++ b/src/main/java/io/socket/global/Global.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.global;
+package io.socket.global;
 
 
 import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/com/github/nkzawa/parseqs/ParseQS.java b/src/main/java/io/socket/parseqs/ParseQS.java
similarity index 92%
rename from src/main/java/com/github/nkzawa/parseqs/ParseQS.java
rename to src/main/java/io/socket/parseqs/ParseQS.java
index 33f2320..fe597ba 100644
--- a/src/main/java/com/github/nkzawa/parseqs/ParseQS.java
+++ b/src/main/java/io/socket/parseqs/ParseQS.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.parseqs;
+package io.socket.parseqs;
 
 
-import com.github.nkzawa.global.Global;
+import io.socket.global.Global;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/github/nkzawa/thread/EventThread.java b/src/main/java/io/socket/thread/EventThread.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/thread/EventThread.java
rename to src/main/java/io/socket/thread/EventThread.java
index 5ae896b..64c6ab9 100644
--- a/src/main/java/com/github/nkzawa/thread/EventThread.java
+++ b/src/main/java/io/socket/thread/EventThread.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.thread;
+package io.socket.thread;
 
 
 import java.util.concurrent.ExecutorService;
diff --git a/src/main/java/com/github/nkzawa/utf8/UTF8.java b/src/main/java/io/socket/utf8/UTF8.java
similarity index 99%
rename from src/main/java/com/github/nkzawa/utf8/UTF8.java
rename to src/main/java/io/socket/utf8/UTF8.java
index c939ab8..75d26eb 100644
--- a/src/main/java/com/github/nkzawa/utf8/UTF8.java
+++ b/src/main/java/io/socket/utf8/UTF8.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.utf8;
+package io.socket.utf8;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/github/nkzawa/utf8/UTF8Exception.java b/src/main/java/io/socket/utf8/UTF8Exception.java
similarity index 92%
rename from src/main/java/com/github/nkzawa/utf8/UTF8Exception.java
rename to src/main/java/io/socket/utf8/UTF8Exception.java
index 3b269ce..b46badf 100644
--- a/src/main/java/com/github/nkzawa/utf8/UTF8Exception.java
+++ b/src/main/java/io/socket/utf8/UTF8Exception.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.utf8;
+package io.socket.utf8;
 
 import java.io.IOException;
 
diff --git a/src/test/java/com/github/nkzawa/emitter/EmitterTest.java b/src/test/java/io/socket/emitter/EmitterTest.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/emitter/EmitterTest.java
rename to src/test/java/io/socket/emitter/EmitterTest.java
index 8a83358..d574cf1 100644
--- a/src/test/java/com/github/nkzawa/emitter/EmitterTest.java
+++ b/src/test/java/io/socket/emitter/EmitterTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.emitter;
+package io.socket.emitter;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java b/src/test/java/io/socket/engineio/client/BinaryPollingTest.java
similarity index 95%
rename from src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java
rename to src/test/java/io/socket/engineio/client/BinaryPollingTest.java
index 96e8f6c..be0445e 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java
+++ b/src/test/java/io/socket/engineio/client/BinaryPollingTest.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.transports.Polling;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.transports.Polling;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java b/src/test/java/io/socket/engineio/client/BinaryWSTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java
rename to src/test/java/io/socket/engineio/client/BinaryWSTest.java
index ca36d33..0d670dd 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java
+++ b/src/test/java/io/socket/engineio/client/BinaryWSTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/Connection.java b/src/test/java/io/socket/engineio/client/Connection.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/engineio/client/Connection.java
rename to src/test/java/io/socket/engineio/client/Connection.java
index 9d9b98b..5fa5a36 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/Connection.java
+++ b/src/test/java/io/socket/engineio/client/Connection.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java b/src/test/java/io/socket/engineio/client/ConnectionTest.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java
rename to src/test/java/io/socket/engineio/client/ConnectionTest.java
index a1f5c6a..950c50c 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java
+++ b/src/test/java/io/socket/engineio/client/ConnectionTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java b/src/test/java/io/socket/engineio/client/ExecutionTest.java
similarity index 84%
rename from src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java
rename to src/test/java/io/socket/engineio/client/ExecutionTest.java
index 0a2352a..a24a6f8 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java
+++ b/src/test/java/io/socket/engineio/client/ExecutionTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,17 +21,17 @@ public class ExecutionTest extends Connection {
 
     @Test(timeout = TIMEOUT)
     public void execConnection() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.engineio.client.executions.Connection");
+        exec("io.socket.engineio.client.executions.Connection");
     }
 
     @Test(timeout = TIMEOUT)
     public void execConnectionFailure() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.engineio.client.executions.ConnectionFailure");
+        exec("io.socket.engineio.client.executions.ConnectionFailure");
     }
 
     @Test(timeout = TIMEOUT)
     public void execImmediateClose() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.engineio.client.executions.ImmediateClose");
+        exec("io.socket.engineio.client.executions.ImmediateClose");
     }
 
     private void exec(String mainClass) throws InterruptedException, IOException {
diff --git a/src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java
rename to src/test/java/io/socket/engineio/client/SSLConnectionTest.java
index 05ab897..a68a5bd 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java
+++ b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.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/com/github/nkzawa/engineio/client/ServerConnectionTest.java b/src/test/java/io/socket/engineio/client/ServerConnectionTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
rename to src/test/java/io/socket/engineio/client/ServerConnectionTest.java
index 14a6a17..c2bdaad 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
+++ b/src/test/java/io/socket/engineio/client/ServerConnectionTest.java
@@ -1,9 +1,9 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.WebSocket;
+import io.socket.thread.EventThread;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/SocketTest.java b/src/test/java/io/socket/engineio/client/SocketTest.java
similarity index 90%
rename from src/test/java/com/github/nkzawa/engineio/client/SocketTest.java
rename to src/test/java/io/socket/engineio/client/SocketTest.java
index 0080b08..54df805 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/SocketTest.java
+++ b/src/test/java/io/socket/engineio/client/SocketTest.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.WebSocket;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/TransportTest.java b/src/test/java/io/socket/engineio/client/TransportTest.java
similarity index 95%
rename from src/test/java/com/github/nkzawa/engineio/client/TransportTest.java
rename to src/test/java/io/socket/engineio/client/TransportTest.java
index 5b0cb05..6130530 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/TransportTest.java
+++ b/src/test/java/io/socket/engineio/client/TransportTest.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
 
-import com.github.nkzawa.engineio.client.transports.PollingXHR;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
+import io.socket.engineio.client.transports.PollingXHR;
+import io.socket.engineio.client.transports.WebSocket;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -136,7 +136,7 @@ public class TransportTest {
 
     class WS extends WebSocket {
 
-        public WS(Options opts) {
+        public WS(Transport.Options opts) {
             super(opts);
         }
 
diff --git a/src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java b/src/test/java/io/socket/engineio/client/executions/Connection.java
similarity index 77%
rename from src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java
rename to src/test/java/io/socket/engineio/client/executions/Connection.java
index 4e48f98..ac91686 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java
+++ b/src/test/java/io/socket/engineio/client/executions/Connection.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client.executions;
+package io.socket.engineio.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Socket;
 
 import java.net.URISyntaxException;
 
diff --git a/src/test/java/com/github/nkzawa/engineio/client/executions/ConnectionFailure.java b/src/test/java/io/socket/engineio/client/executions/ConnectionFailure.java
similarity index 83%
rename from src/test/java/com/github/nkzawa/engineio/client/executions/ConnectionFailure.java
rename to src/test/java/io/socket/engineio/client/executions/ConnectionFailure.java
index f95b0ac..5450113 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/executions/ConnectionFailure.java
+++ b/src/test/java/io/socket/engineio/client/executions/ConnectionFailure.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client.executions;
+package io.socket.engineio.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Socket;
 
 import java.net.URISyntaxException;
 
diff --git a/src/test/java/com/github/nkzawa/engineio/client/executions/ImmediateClose.java b/src/test/java/io/socket/engineio/client/executions/ImmediateClose.java
similarity index 82%
rename from src/test/java/com/github/nkzawa/engineio/client/executions/ImmediateClose.java
rename to src/test/java/io/socket/engineio/client/executions/ImmediateClose.java
index e89365f..c90b11f 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/executions/ImmediateClose.java
+++ b/src/test/java/io/socket/engineio/client/executions/ImmediateClose.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client.executions;
+package io.socket.engineio.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Socket;
 
 import java.net.URISyntaxException;
 
diff --git a/src/test/java/com/github/nkzawa/engineio/parser/ParserTest.java b/src/test/java/io/socket/engineio/parser/ParserTest.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/engineio/parser/ParserTest.java
rename to src/test/java/io/socket/engineio/parser/ParserTest.java
index 748b5b1..70a2d78 100644
--- a/src/test/java/com/github/nkzawa/engineio/parser/ParserTest.java
+++ b/src/test/java/io/socket/engineio/parser/ParserTest.java
@@ -1,10 +1,10 @@
-package com.github.nkzawa.engineio.parser;
+package io.socket.engineio.parser;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import static com.github.nkzawa.engineio.parser.Parser.*;
+import static io.socket.engineio.parser.Parser.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
diff --git a/src/test/java/com/github/nkzawa/global/GlobalTest.java b/src/test/java/io/socket/global/GlobalTest.java
similarity index 95%
rename from src/test/java/com/github/nkzawa/global/GlobalTest.java
rename to src/test/java/io/socket/global/GlobalTest.java
index 35c82e9..b88ad23 100644
--- a/src/test/java/com/github/nkzawa/global/GlobalTest.java
+++ b/src/test/java/io/socket/global/GlobalTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.global;
+package io.socket.global;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/parseqs/ParseQSTest.java b/src/test/java/io/socket/parseqs/ParseQSTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/parseqs/ParseQSTest.java
rename to src/test/java/io/socket/parseqs/ParseQSTest.java
index 2f2272b..3ada6c5 100644
--- a/src/test/java/com/github/nkzawa/parseqs/ParseQSTest.java
+++ b/src/test/java/io/socket/parseqs/ParseQSTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.parseqs;
+package io.socket.parseqs;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/thread/EventThreadTest.java b/src/test/java/io/socket/thread/EventThreadTest.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/thread/EventThreadTest.java
rename to src/test/java/io/socket/thread/EventThreadTest.java
index 1deb88f..594a757 100644
--- a/src/test/java/com/github/nkzawa/thread/EventThreadTest.java
+++ b/src/test/java/io/socket/thread/EventThreadTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.thread;
+package io.socket.thread;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/utf8/UTF8Test.java b/src/test/java/io/socket/utf8/UTF8Test.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/utf8/UTF8Test.java
rename to src/test/java/io/socket/utf8/UTF8Test.java
index 3aa91e1..10aa4c1 100644
--- a/src/test/java/com/github/nkzawa/utf8/UTF8Test.java
+++ b/src/test/java/io/socket/utf8/UTF8Test.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.utf8;
+package io.socket.utf8;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/test/resources/package.json b/src/test/resources/package.json
index a8f8b23..94b2131 100644
--- a/src/test/resources/package.json
+++ b/src/test/resources/package.json
@@ -1,6 +1,4 @@
 {
-  "name": "engine.io-client.java-test",
-  "version": "0.0.0",
   "private": true,
   "dependencies": {
     "engine.io": "1.5.2"