diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c8397c9
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/com/captainalm/test/calmnet/Main.java b/src/com/captainalm/test/calmnet/Main.java
index f1943e8..be84fa8 100644
--- a/src/com/captainalm/test/calmnet/Main.java
+++ b/src/com/captainalm/test/calmnet/Main.java
@@ -1,7 +1,6 @@
 package com.captainalm.test.calmnet;
 
-import com.captainalm.lib.calmnet.SSLUtilities;
-import com.captainalm.lib.calmnet.SSLUtilityException;
+import com.captainalm.lib.calmnet.ssl.*;
 import com.captainalm.lib.calmnet.packet.IPacket;
 import com.captainalm.lib.calmnet.packet.PacketException;
 import com.captainalm.lib.calmnet.packet.core.NetworkSSLUpgradePacket;
diff --git a/src/com/captainalm/test/calmnet/MyPacketFactory.java b/src/com/captainalm/test/calmnet/MyPacketFactory.java
index c4a783c..b6ef9f1 100644
--- a/src/com/captainalm/test/calmnet/MyPacketFactory.java
+++ b/src/com/captainalm/test/calmnet/MyPacketFactory.java
@@ -1,6 +1,8 @@
 package com.captainalm.test.calmnet;
 
 import com.captainalm.lib.calmnet.packet.*;
+import com.captainalm.lib.calmnet.packet.factory.CALMNETPacketFactory;
+import com.captainalm.lib.calmnet.packet.factory.IPacketFactory;
 
 import java.nio.file.Path;
 
diff --git a/src/com/captainalm/test/calmnet/NetworkRuntime.java b/src/com/captainalm/test/calmnet/NetworkRuntime.java
index aee4cc2..5c6adf2 100644
--- a/src/com/captainalm/test/calmnet/NetworkRuntime.java
+++ b/src/com/captainalm/test/calmnet/NetworkRuntime.java
@@ -1,12 +1,9 @@
 package com.captainalm.test.calmnet;
 
-import com.captainalm.lib.calmnet.SSLUtilities;
-import com.captainalm.lib.calmnet.SSLUtilityException;
+import com.captainalm.lib.calmnet.ssl.*;
 import com.captainalm.lib.calmnet.packet.*;
 import com.captainalm.lib.calmnet.packet.core.NetworkSSLUpgradePacket;
-import com.captainalm.lib.calmnet.packet.fragment.FragmentAllocationPacket;
-import com.captainalm.lib.calmnet.packet.fragment.FragmentPIDPacket;
-import com.captainalm.lib.calmnet.packet.fragment.FragmentSendStopPacket;
+import com.captainalm.lib.calmnet.packet.fragment.*;
 import com.captainalm.lib.calmnet.stream.NetworkInputStream;
 import com.captainalm.lib.calmnet.stream.NetworkOutputStream;
 
@@ -89,9 +86,15 @@ public final class NetworkRuntime {
 
     private void init(boolean useFragmentation, boolean verifyFragmentPayloads) {
         fragmentReceiver = (useFragmentation) ? new FragmentReceiver(factory.getPacketLoader(), factory) : null;
-        if (fragmentReceiver != null) fragmentReceiver.setResponseVerification(verifyFragmentPayloads);
+        if (fragmentReceiver != null) {
+            fragmentReceiver.setResponseVerification(verifyFragmentPayloads);
+            fragmentReceiver.setSentDataWillBeAllVerified(verifyFragmentPayloads);
+        }
         fragmentSender = (useFragmentation) ? new FragmentSender(factory.getPacketLoader()) : null;
-        if (fragmentSender != null) fragmentSender.setResponseVerification(verifyFragmentPayloads);
+        if (fragmentSender != null) {
+            fragmentSender.setResponseVerification(verifyFragmentPayloads);
+            fragmentSender.setSentDataWillBeAllVerified(verifyFragmentPayloads);
+        }
         receiveThread.start();
         if (useFragmentation) {
             fragmentMonitorThread.start();