diff --git a/src/main/java/com/rosetta/im/client/tags/Authentificate.java b/src/main/java/com/rosetta/im/client/tags/Authentificate.java
index 82c350b..87499fd 100644
--- a/src/main/java/com/rosetta/im/client/tags/Authentificate.java
+++ b/src/main/java/com/rosetta/im/client/tags/Authentificate.java
@@ -1,7 +1,7 @@
package com.rosetta.im.client.tags;
import com.rosetta.im.packet.enums.HandshakeStage;
-import com.rosetta.im.protocol.ECITag;
+import com.rosetta.im.protocol.client.ECITag;
/**
* Это вложенный обьект для клиента, содержащий информацию об аутентификации.
diff --git a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java b/src/main/java/com/rosetta/im/executors/Executor0Handshake.java
index 7f99260..b80682a 100644
--- a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java
+++ b/src/main/java/com/rosetta/im/executors/Executor0Handshake.java
@@ -10,7 +10,7 @@ import com.rosetta.im.database.DatabaseManager;
import com.rosetta.im.database.entity.User;
import com.rosetta.im.packet.Packet0Handshake;
import com.rosetta.im.packet.enums.HandshakeStage;
-import com.rosetta.im.protocol.Client;
+import com.rosetta.im.protocol.client.Client;
import com.rosetta.im.protocol.packet.Packet;
import com.rosetta.im.protocol.packet.PacketExecutor;
diff --git a/src/main/java/com/rosetta/im/protocol/Server.java b/src/main/java/com/rosetta/im/protocol/Server.java
index effe878..499e174 100644
--- a/src/main/java/com/rosetta/im/protocol/Server.java
+++ b/src/main/java/com/rosetta/im/protocol/Server.java
@@ -10,6 +10,7 @@ import org.java_websocket.WebSocket;
import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer;
+import com.rosetta.im.protocol.client.Client;
import com.rosetta.im.protocol.packet.Packet;
import com.rosetta.im.protocol.packet.PacketExecutor;
import com.rosetta.im.protocol.packet.PacketManager;
diff --git a/src/main/java/com/rosetta/im/protocol/Client.java b/src/main/java/com/rosetta/im/protocol/client/Client.java
similarity index 97%
rename from src/main/java/com/rosetta/im/protocol/Client.java
rename to src/main/java/com/rosetta/im/protocol/client/Client.java
index 0656f76..b119d8c 100644
--- a/src/main/java/com/rosetta/im/protocol/Client.java
+++ b/src/main/java/com/rosetta/im/protocol/client/Client.java
@@ -1,10 +1,12 @@
-package com.rosetta.im.protocol;
+package com.rosetta.im.protocol.client;
import java.util.HashSet;
import java.util.Set;
import org.java_websocket.WebSocket;
+import com.rosetta.im.protocol.BaseFailures;
+import com.rosetta.im.protocol.ServerFailures;
import com.rosetta.im.protocol.util.StringUtil;
/**
diff --git a/src/main/java/com/rosetta/im/protocol/ECITag.java b/src/main/java/com/rosetta/im/protocol/client/ECITag.java
similarity index 94%
rename from src/main/java/com/rosetta/im/protocol/ECITag.java
rename to src/main/java/com/rosetta/im/protocol/client/ECITag.java
index efc4e2d..1a12a26 100644
--- a/src/main/java/com/rosetta/im/protocol/ECITag.java
+++ b/src/main/java/com/rosetta/im/protocol/client/ECITag.java
@@ -1,4 +1,4 @@
-package com.rosetta.im.protocol;
+package com.rosetta.im.protocol.client;
/**
* Embedded Client Information Tag.
diff --git a/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java b/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java
index cd197be..f140de0 100644
--- a/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java
+++ b/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java
@@ -1,7 +1,7 @@
package com.rosetta.im.protocol.packet;
-import com.rosetta.im.protocol.Client;
import com.rosetta.im.protocol.Settings;
+import com.rosetta.im.protocol.client.Client;
/**
* Базовый класс для обработчиков пакетов.
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index dcf79da..40ca860 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -8,8 +8,6 @@
your_password
update
- true
- true
diff --git a/target/classes/com/rosetta/im/executors/Executor0Handshake.class b/target/classes/com/rosetta/im/executors/Executor0Handshake.class
index fddac12..3602d03 100644
Binary files a/target/classes/com/rosetta/im/executors/Executor0Handshake.class and b/target/classes/com/rosetta/im/executors/Executor0Handshake.class differ
diff --git a/target/classes/com/rosetta/im/protocol/Client.class b/target/classes/com/rosetta/im/protocol/Client.class
deleted file mode 100644
index 42efb97..0000000
Binary files a/target/classes/com/rosetta/im/protocol/Client.class and /dev/null differ
diff --git a/target/classes/com/rosetta/im/protocol/Server.class b/target/classes/com/rosetta/im/protocol/Server.class
index cbcc02d..733b0bc 100644
Binary files a/target/classes/com/rosetta/im/protocol/Server.class and b/target/classes/com/rosetta/im/protocol/Server.class differ
diff --git a/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class b/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class
index 047954b..d566856 100644
Binary files a/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class and b/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class differ