diff --git a/src/main/hw/connect/neko/NekoConnection.hx b/src/main/hw/connect/server/ServerConnection.hx
similarity index 89%
rename from src/main/hw/connect/neko/NekoConnection.hx
rename to src/main/hw/connect/server/ServerConnection.hx
index cf915af..b6ee376 100755
--- a/src/main/hw/connect/neko/NekoConnection.hx
+++ b/src/main/hw/connect/server/ServerConnection.hx
@@ -1,10 +1,10 @@
-package hw.connect.neko;
+package hw.connect.server;
 
 import hw.Timer;
 import protohx.Message;
 import sys.net.Socket;
 
-class NekoConnection<O:Message, I:Message> extends BaseConnection<O, I> {
+class ServerConnection<O:Message, I:Message> extends BaseConnection<O, I> {
 
     public var socket(default, null):Socket;
 
diff --git a/src/main/hw/connect/neko/NekoWSConnection.hx b/src/main/hw/connect/server/ServerWSConnection.hx
similarity index 97%
rename from src/main/hw/connect/neko/NekoWSConnection.hx
rename to src/main/hw/connect/server/ServerWSConnection.hx
index 8879376..a9f7884 100644
--- a/src/main/hw/connect/neko/NekoWSConnection.hx
+++ b/src/main/hw/connect/server/ServerWSConnection.hx
@@ -1,4 +1,4 @@
-package hw.connect.neko;
+package hw.connect.server;
 
 import com.hurlant.crypto.hash.SHA1;
 import com.hurlant.util.Base64;
@@ -7,7 +7,7 @@ import haxe.io.BytesBuffer;
 import protohx.Message;
 import sys.net.Socket;
 
-class NekoWSConnection<O:Message, I:Message> extends NekoConnection<O, I> {
+class ServerWSConnection<O:Message, I:Message> extends ServerConnection<O, I> {
 
     private var opened:Bool;
     private var buffer:Bytes;
diff --git a/src/main/hw/connect/session/ProtoSession.hx b/src/main/hw/connect/session/ProtoSession.hx
index c64e200..483f1db 100644
--- a/src/main/hw/connect/session/ProtoSession.hx
+++ b/src/main/hw/connect/session/ProtoSession.hx
@@ -1,8 +1,8 @@
 package hw.connect.session;
 
 import haxe.io.Bytes;
-import hw.connect.neko.NekoConnection;
-import hw.connect.neko.NekoWSConnection;
+import hw.connect.server.ServerConnection;
+import hw.connect.server.ServerWSConnection;
 import protohx.Message;
 import sys.net.Socket;
 
@@ -40,9 +40,9 @@ class ProtoSession<O:Message, I:Message> implements ISession {
             return null;
         }
         if (StringTools.startsWith(str, "GET")) {
-            connection = new NekoWSConnection<O, I>(socket, request);
+            connection = new ServerWSConnection<O, I>(socket, request);
         } else {
-            connection = new NekoConnection<O, I>(socket, request);
+            connection = new ServerConnection<O, I>(socket, request);
         }
         connection.receiveHandler.connect(onRequest);
         return connection;