diff --git a/src/main/java/com/github/nkzawa/engineio/client/Socket.java b/src/main/java/com/github/nkzawa/engineio/client/Socket.java
index 3c3278f..6280d31 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/Socket.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/Socket.java
@@ -7,6 +7,7 @@ import com.github.nkzawa.engineio.client.transports.WebSocket;
 import com.github.nkzawa.engineio.parser.HandshakeData;
 import com.github.nkzawa.engineio.parser.Packet;
 import com.github.nkzawa.engineio.parser.Parser;
+import com.github.nkzawa.thread.EventThread;
 import com.google.gson.Gson;
 
 import java.net.URI;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/Transport.java b/src/main/java/com/github/nkzawa/engineio/client/Transport.java
index 67795ff..0a3b90a 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/Transport.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/Transport.java
@@ -4,6 +4,7 @@ package com.github.nkzawa.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 java.util.Map;
 
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java b/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java
index 71ef9dc..39edace 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/transports/Polling.java
@@ -1,7 +1,7 @@
 package com.github.nkzawa.engineio.client.transports;
 
 
-import com.github.nkzawa.engineio.client.EventThread;
+import com.github.nkzawa.thread.EventThread;
 import com.github.nkzawa.engineio.client.Transport;
 import com.github.nkzawa.engineio.client.Util;
 import com.github.nkzawa.engineio.parser.Packet;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
index ad79a8c..a331ba4 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
@@ -2,7 +2,7 @@ package com.github.nkzawa.engineio.client.transports;
 
 
 import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.EventThread;
+import com.github.nkzawa.thread.EventThread;
 
 import java.io.*;
 import java.net.HttpURLConnection;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
index 63c5f8d..5be709b 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
@@ -1,7 +1,7 @@
 package com.github.nkzawa.engineio.client.transports;
 
 
-import com.github.nkzawa.engineio.client.EventThread;
+import com.github.nkzawa.thread.EventThread;
 import com.github.nkzawa.engineio.client.Transport;
 import com.github.nkzawa.engineio.client.Util;
 import com.github.nkzawa.engineio.parser.Packet;
diff --git a/src/main/java/com/github/nkzawa/engineio/client/EventThread.java b/src/main/java/com/github/nkzawa/thread/EventThread.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/engineio/client/EventThread.java
rename to src/main/java/com/github/nkzawa/thread/EventThread.java
index 1253ca3..cdbe545 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/EventThread.java
+++ b/src/main/java/com/github/nkzawa/thread/EventThread.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package com.github.nkzawa.thread;
 
 
 import java.util.concurrent.ExecutorService;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java b/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
index 34fdad0..70e8c9e 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
+++ b/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
@@ -4,6 +4,7 @@ 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.engineio.parser.HandshakeData;
+import com.github.nkzawa.thread.EventThread;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/EventThreadTest.java b/src/test/java/com/github/nkzawa/thread/EventThreadTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/engineio/client/EventThreadTest.java
rename to src/test/java/com/github/nkzawa/thread/EventThreadTest.java
index 470ddb2..bf0736b 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/EventThreadTest.java
+++ b/src/test/java/com/github/nkzawa/thread/EventThreadTest.java
@@ -1,5 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package com.github.nkzawa.thread;
 
+import com.github.nkzawa.thread.EventThread;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;