diff --git a/TODO b/TODO
index 8c6870b..18998b8 100644
--- a/TODO
+++ b/TODO
@@ -34,4 +34,13 @@
 - [ ] Metrics
 - [ ] Graceful Disconnects (?)
 - [ ] Version Negotiation (?)
-- [ ] Feature flag Negotiation (?)
\ No newline at end of file
+- [ ] Feature flag Negotiation (?)
+- [ ] Automatic serialization of non-complex types
+- [ ] Fully asynchronous P2P hole punching using an event-driven I/O model.
+- [ ] Add `UDPTransportLayer` and UDP client/server backends, including UDP hole punching for P2P.
+- [ ] Enhance error events for P2P connection failures with granular, actionable reasons.
+- [ ] Check if PeerLocator's destructor automatically joins its internal thread.
+- [ ] Document thread-safety guarantees and concurrency model for all public APIs.
+- [ ] Comprehensive performance benchmarks and conduct memory usage profiling.
+- [ ] Security audit for the encryption layer
+- [x] Refactor znet.h into smaller, modular headers for specific functionalities.
\ No newline at end of file
diff --git a/examples/basic/client/main.cc b/examples/basic/client/main.cc
index 4f1edc2..3b2f3e7 100644
--- a/examples/basic/client/main.cc
+++ b/examples/basic/client/main.cc
@@ -8,9 +8,16 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <iostream>
 
 using namespace znet;
 
diff --git a/examples/basic/common/packets.h b/examples/basic/common/packets.h
index 0870fb4..6fc7f40 100644
--- a/examples/basic/common/packets.h
+++ b/examples/basic/common/packets.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "znet/znet.h"
+#include "../../../znet/include/znet/packet.h"
 
 using namespace znet;
 
diff --git a/examples/basic/server/main.cc b/examples/basic/server/main.cc
index e22e242..ef7885e 100644
--- a/examples/basic/server/main.cc
+++ b/examples/basic/server/main.cc
@@ -8,8 +8,17 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/server_events.h"
+#include "znet/codec.h"
+#include "znet/server.h"
+#include "znet/signal_handler.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <iostream>
 
 using namespace znet;
 
diff --git a/examples/multiversion/client-v1/main.cc b/examples/multiversion/client-v1/main.cc
index b6278f3..96edd50 100644
--- a/examples/multiversion/client-v1/main.cc
+++ b/examples/multiversion/client-v1/main.cc
@@ -8,18 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
-#include "packets.h"
-#include "znet/znet.h"
-
-using namespace znet;
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
 
-
-#include <iostream>
 #include "packets.h"
-#include "znet/znet.h"
 #include "player.h"
 
+#include <iostream>
+
 using namespace znet;
 
 Codecs codecs_;
diff --git a/examples/multiversion/client-v2/main.cc b/examples/multiversion/client-v2/main.cc
index 5df62d0..d7c8c7c 100644
--- a/examples/multiversion/client-v2/main.cc
+++ b/examples/multiversion/client-v2/main.cc
@@ -8,18 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
-#include "packets.h"
-#include "znet/znet.h"
-
-using namespace znet;
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
 
-
-#include <iostream>
 #include "packets.h"
-#include "znet/znet.h"
 #include "player.h"
 
+#include <iostream>
+
 using namespace znet;
 
 Codecs codecs_;
diff --git a/examples/multiversion/common/packets.h b/examples/multiversion/common/packets.h
index adbfab6..f5852dc 100644
--- a/examples/multiversion/common/packets.h
+++ b/examples/multiversion/common/packets.h
@@ -10,7 +10,9 @@
 
 #pragma once
 
-#include "znet/znet.h"
+#include "znet/codec.h"
+#include "znet/packet_handler.h"
+#include "znet/types.h"
 #include "types.h"
 
 using namespace znet;
diff --git a/examples/multiversion/server/main.cc b/examples/multiversion/server/main.cc
index 5305298..7fde854 100644
--- a/examples/multiversion/server/main.cc
+++ b/examples/multiversion/server/main.cc
@@ -8,10 +8,19 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <algorithm>
-#include <unordered_map>
+
+#include "znet/client.h"
+#include "znet/codec.h"
+#include "znet/init.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/server_events.h"
+#include "znet/server.h"
+#include "znet/signal_handler.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <algorithm>
 
 using namespace znet;
 
diff --git a/examples/p2p/main.cc b/examples/p2p/main.cc
index 9af920f..7cc90cb 100644
--- a/examples/p2p/main.cc
+++ b/examples/p2p/main.cc
@@ -8,12 +8,14 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <utility>
+#include "znet/p2p.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
 
+#include <utility>
 #include <deque>
 #include "cxxopts.h"
-#include "znet/znet.h"
-#include "znet/base/inet_addr.h"
 
 using namespace znet;
 
diff --git a/rendezvous-server/main.cc b/rendezvous-server/main.cc
index 60f8efe..dfed8d4 100644
--- a/rendezvous-server/main.cc
+++ b/rendezvous-server/main.cc
@@ -8,13 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <utility>
+#include "znet/p2p.h"
+#include "znet/p2p/rendezvous.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/server_events.h"
+#include "znet/init.h"
+
+#include "cxxopts.h"
 
+#include <utility>
 #include <deque>
 #include <random>
-#include "cxxopts.h"
-#include "znet/p2p/rendezvous.h"
-#include "znet/znet.h"
 
 struct UserData {
   std::shared_ptr<znet::PeerSession> session_;
diff --git a/tests/buffer.cc b/tests/buffer.cc
index daf5e01..bde3f4a 100644
--- a/tests/buffer.cc
+++ b/tests/buffer.cc
@@ -9,8 +9,8 @@
 //
 
 #define ZNET_BUFFER_COUNT_MEMORY_ALLOCATIONS
-#include "znet/znet.h"
 
+#include "znet/buffer.h"
 #include "gtest/gtest.h"
 
 using namespace znet;
diff --git a/znet/include/znet/backends/tcp.h b/znet/include/znet/backends/tcp.h
index ced79a2..e81679d 100644
--- a/znet/include/znet/backends/tcp.h
+++ b/znet/include/znet/backends/tcp.h
@@ -27,7 +27,7 @@ namespace backends {
 class TCPTransportLayer : public TransportLayer {
  public:
   TCPTransportLayer(SocketHandle socket);
-  ~TCPTransportLayer();
+  ~TCPTransportLayer() override;
 
   std::shared_ptr<Buffer> Receive() override;
   bool Send(std::shared_ptr<Buffer> buffer, SendOptions options = {}) override;
diff --git a/znet/include/znet/buffer.h b/znet/include/znet/buffer.h
index a01155b..16a6f3f 100644
--- a/znet/include/znet/buffer.h
+++ b/znet/include/znet/buffer.h
@@ -10,11 +10,12 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/inet_addr.h"
+#include "znet/types.h"
+#include "znet/util.h"
 #include "znet/logger.h"
-#include "znet/base/util.h"
-#include "znet/base/inet_addr.h"
+#include "znet/precompiled.h"
+
 #include <bitset>
 
 namespace znet {
diff --git a/znet/include/znet/client.h b/znet/include/znet/client.h
index 59ee94d..9a1b856 100644
--- a/znet/include/znet/client.h
+++ b/znet/include/znet/client.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <znet/backends/backend.h>
+#include "znet/backends/backend.h"
 #include "znet/interface.h"
 #include "znet/peer_session.h"
 #include "znet/precompiled.h"
@@ -34,8 +34,7 @@ class Client : public Interface {
  public:
   Client(const ClientConfig& config);
   Client(const Client&) = delete;
-
-  ~Client();
+  ~Client() override;
 
   /**
    * @brief Binds client to configured IP address and port. This function is not thread-safe.
diff --git a/znet/include/znet/client_events.h b/znet/include/znet/client_events.h
index ce1cd17..2184b44 100644
--- a/znet/include/znet/client_events.h
+++ b/znet/include/znet/client_events.h
@@ -13,7 +13,7 @@
 
 #include "znet/precompiled.h"
 #include "znet/peer_session.h"
-#include "znet/base/event.h"
+#include "znet/event.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/close_options.h b/znet/include/znet/close_options.h
index d4402e9..a26c32c 100644
--- a/znet/include/znet/close_options.h
+++ b/znet/include/znet/close_options.h
@@ -15,7 +15,6 @@
 #ifndef ZNET_PARENT_CLOSE_OPTIONS_H
 #define ZNET_PARENT_CLOSE_OPTIONS_H
 
-
 #include "znet/precompiled.h"
 #include <cstdint>
 #include <type_traits>
diff --git a/znet/include/znet/codec.h b/znet/include/znet/codec.h
index 3d002ee..35dc4da 100644
--- a/znet/include/znet/codec.h
+++ b/znet/include/znet/codec.h
@@ -12,10 +12,10 @@
 #define ZNET_PARENT_CODEC_H
 
 #include "znet/precompiled.h"
-#include "znet/base/packet.h"
-#include "znet/packet_serializer.h"
-#include "znet/packet_handler.h"
+#include "znet/packet.h"
 #include "znet/buffer.h"
+#include "znet/packet_handler.h"
+#include "znet/packet_serializer.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/encryption.h b/znet/include/znet/encryption.h
index 663e22c..909b43e 100644
--- a/znet/include/znet/encryption.h
+++ b/znet/include/znet/encryption.h
@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
-#include "znet/base/packet.h"
-#include "znet/logger.h"
+#include "znet/packet.h"
 #include "znet/packet_handler.h"
+#include "znet/precompiled.h"
 
 #include <openssl/dh.h>
 #include <openssl/engine.h>
diff --git a/znet/include/znet/error.h b/znet/include/znet/error.h
index 91fbe72..3077d15 100644
--- a/znet/include/znet/error.h
+++ b/znet/include/znet/error.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2024 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -8,8 +8,12 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#pragma once
+#ifndef ZNET_PARENT_ERROR_H
+#define ZNET_PARENT_ERROR_H
 
 #include "znet/precompiled.h"
 
-std::string GetLastErrorInfo();
\ No newline at end of file
+std::string GetLastErrorInfo();
+
+#endif
+
diff --git a/znet/include/znet/base/event.h b/znet/include/znet/event.h
similarity index 100%
rename from znet/include/znet/base/event.h
rename to znet/include/znet/event.h
diff --git a/znet/include/znet/base/inet_addr.h b/znet/include/znet/inet_addr.h
similarity index 98%
rename from znet/include/znet/base/inet_addr.h
rename to znet/include/znet/inet_addr.h
index f8c8b06..74c0de4 100644
--- a/znet/include/znet/base/inet_addr.h
+++ b/znet/include/znet/inet_addr.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/types.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/init.h b/znet/include/znet/init.h
index 4d79f30..d909233 100644
--- a/znet/include/znet/init.h
+++ b/znet/include/znet/init.h
@@ -16,7 +16,7 @@
 #define ZNET_PARENT_SOCKET_GUARD_H
 
 #include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/types.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/interface.h b/znet/include/znet/interface.h
index 542878f..fbe34b3 100644
--- a/znet/include/znet/interface.h
+++ b/znet/include/znet/interface.h
@@ -10,11 +10,11 @@
 
 #pragma once
 
-#include <utility>
-
-#include "znet/precompiled.h"
-#include "znet/base/event.h"
+#include "znet/event.h"
 #include "znet/packet_handler.h"
+#include "znet/precompiled.h"
+
+#include <utility>
 
 namespace znet {
 
diff --git a/znet/include/znet/p2p.h b/znet/include/znet/p2p.h
new file mode 100644
index 0000000..c61f59b
--- /dev/null
+++ b/znet/include/znet/p2p.h
@@ -0,0 +1,21 @@
+//
+//    Copyright 2025 Metehan Gezer
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+
+//
+// Created by Metehan Gezer on 22.12.2025.
+//
+
+#ifndef ZNET_PARENT_P2P_H
+#define ZNET_PARENT_P2P_H
+
+#include "znet/p2p/dialer.h"
+#include "znet/p2p/locator.h"
+
+#endif  //ZNET_PARENT_P2P_H
diff --git a/znet/include/znet/p2p/dialer.h b/znet/include/znet/p2p/dialer.h
index a3ceeb4..e6090d6 100644
--- a/znet/include/znet/p2p/dialer.h
+++ b/znet/include/znet/p2p/dialer.h
@@ -15,10 +15,9 @@
 #ifndef ZNET_PARENT_PUNCH_H
 #define ZNET_PARENT_PUNCH_H
 
-#include "znet/base/inet_addr.h"
+#include "znet/inet_addr.h"
 #include "znet/peer_session.h"
 #include "znet/precompiled.h"
-#include "znet/error.h"
 
 namespace znet {
 namespace p2p {
diff --git a/znet/include/znet/p2p/locator.h b/znet/include/znet/p2p/locator.h
index bc03625..f8451dd 100644
--- a/znet/include/znet/p2p/locator.h
+++ b/znet/include/znet/p2p/locator.h
@@ -15,7 +15,7 @@
 #ifndef ZNET_PARENT_LOCATOR_H
 #define ZNET_PARENT_LOCATOR_H
 
-#include "znet/base/event.h"
+#include "znet/event.h"
 #include "znet/client.h"
 #include "znet/client_events.h"
 #include "znet/precompiled.h"
diff --git a/znet/include/znet/p2p/rendezvous.h b/znet/include/znet/p2p/rendezvous.h
index 50a0d39..a90132f 100644
--- a/znet/include/znet/p2p/rendezvous.h
+++ b/znet/include/znet/p2p/rendezvous.h
@@ -36,7 +36,6 @@ namespace p2p {
 // StartPunchRequestPacket S -> C1
 // StartPunchRequestPacket S -> C2
 
-
 enum PacketType {
   PACKET_IDENTIFY,
   PACKET_SET_PEER_NAME,
diff --git a/znet/include/znet/base/packet.h b/znet/include/znet/packet.h
similarity index 77%
rename from znet/include/znet/base/packet.h
rename to znet/include/znet/packet.h
index 70b4519..ffefb6f 100644
--- a/znet/include/znet/base/packet.h
+++ b/znet/include/znet/packet.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -11,14 +11,14 @@
 #pragma once
 
 #include "znet/precompiled.h"
-#include "znet/base/inet_addr.h"
-#include "znet/base/types.h"
 
 namespace znet {
 
+using PacketId = uint64_t;
+
 class Packet {
  public:
-  Packet(PacketId id) : id_(id) {}
+  explicit Packet(PacketId id) : id_(id) {}
   virtual ~Packet() = default;
 
   PacketId id() const { return id_; }
diff --git a/znet/include/znet/packet_handler.h b/znet/include/znet/packet_handler.h
index 613c18e..be8c7e6 100644
--- a/znet/include/znet/packet_handler.h
+++ b/znet/include/znet/packet_handler.h
@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
-#include "znet/base/packet.h"
+#include "znet/packet.h"
 #include "znet/packet_serializer.h"
-#include "znet/logger.h"
+#include "znet/precompiled.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/packet_serializer.h b/znet/include/znet/packet_serializer.h
index 20a3f2e..76b72d0 100644
--- a/znet/include/znet/packet_serializer.h
+++ b/znet/include/znet/packet_serializer.h
@@ -10,9 +10,9 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
+#include "znet/packet.h"
 #include "znet/buffer.h"
-#include "znet/base/packet.h"
+#include "znet/precompiled.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/base/scheduler.h b/znet/include/znet/scheduler.h
similarity index 94%
rename from znet/include/znet/base/scheduler.h
rename to znet/include/znet/scheduler.h
index f6fc2fa..bfc89f4 100644
--- a/znet/include/znet/base/scheduler.h
+++ b/znet/include/znet/scheduler.h
@@ -1,6 +1,6 @@
 
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
 
 #include "znet/precompiled.h"
 #include <chrono>
-#include <thread>
 
 /*
  * By default, this class will use precise sleep; this could result in more
diff --git a/znet/include/znet/send_options.h b/znet/include/znet/send_options.h
index 0c2be4f..5c20c18 100644
--- a/znet/include/znet/send_options.h
+++ b/znet/include/znet/send_options.h
@@ -15,7 +15,6 @@
 #ifndef ZNET_PARENT_SEND_OPTIONS_H
 #define ZNET_PARENT_SEND_OPTIONS_H
 
-
 #include "znet/precompiled.h"
 #include <cstdint>
 #include <type_traits>
diff --git a/znet/include/znet/server.h b/znet/include/znet/server.h
index c0d4ff6..770a5d3 100644
--- a/znet/include/znet/server.h
+++ b/znet/include/znet/server.h
@@ -10,13 +10,13 @@
 
 #pragma once
 
-#include "znet/base/scheduler.h"
+#include "znet/scheduler.h"
+#include "znet/backends/backend.h"
 #include "znet/interface.h"
 #include "znet/logger.h"
 #include "znet/peer_session.h"
 #include "znet/precompiled.h"
 #include "znet/task.h"
-#include "znet/backends/backend.h"
 
 namespace znet {
 
@@ -40,7 +40,6 @@ class Server : public Interface {
   Server();
   explicit Server(const ServerConfig& config);
   Server(const Server&) = delete;
-
   ~Server() override;
 
   /**
diff --git a/znet/include/znet/server_events.h b/znet/include/znet/server_events.h
index 399c95a..3d0993f 100644
--- a/znet/include/znet/server_events.h
+++ b/znet/include/znet/server_events.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "znet/precompiled.h"
-#include "znet/base/event.h"
+#include "znet/event.h"
 #include "znet/peer_session.h"
 
 namespace znet {
diff --git a/znet/include/znet/base/signal_handler.h b/znet/include/znet/signal_handler.h
similarity index 100%
rename from znet/include/znet/base/signal_handler.h
rename to znet/include/znet/signal_handler.h
diff --git a/znet/include/znet/task.h b/znet/include/znet/task.h
index 14b51e3..1149484 100644
--- a/znet/include/znet/task.h
+++ b/znet/include/znet/task.h
@@ -11,12 +11,12 @@
 
 #pragma once
 
+#include "znet/precompiled.h"
+#include "znet/types.h"
+
 #include <thread>
 #include <utility>
 
-#include "znet/precompiled.h"
-#include "znet/base/types.h"
-
 namespace znet {
 class Task {
  public:
diff --git a/znet/include/znet/transport.h b/znet/include/znet/transport.h
index 7b0363b..c821f0d 100644
--- a/znet/include/znet/transport.h
+++ b/znet/include/znet/transport.h
@@ -11,12 +11,10 @@
 
 #pragma once
 
-#include "znet/logger.h"
-#include "znet/base/packet.h"
 #include "znet/precompiled.h"
-#include "znet/send_options.h"
 #include "znet/buffer.h"
 #include "znet/close_options.h"
+#include "znet/send_options.h"
 
 namespace znet {
 
diff --git a/znet/include/znet/base/types.h b/znet/include/znet/types.h
similarity index 98%
rename from znet/include/znet/base/types.h
rename to znet/include/znet/types.h
index c40c3ab..55a2804 100644
--- a/znet/include/znet/base/types.h
+++ b/znet/include/znet/types.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ namespace znet {
 // Use the server.bind_address() function to get the port on Server
 #define ZNET_PORT_AUTO 0
 
-using PacketId = uint64_t;
 using SessionId = uint64_t;
 
 enum class Endianness { LittleEndian, BigEndian };
diff --git a/znet/include/znet/base/util.h b/znet/include/znet/util.h
similarity index 94%
rename from znet/include/znet/base/util.h
rename to znet/include/znet/util.h
index 192a65b..392bf52 100644
--- a/znet/include/znet/base/util.h
+++ b/znet/include/znet/util.h
@@ -1,6 +1,6 @@
 
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -12,12 +12,11 @@
 #pragma once
 
 #include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/types.h"
+
+#include <iomanip>
 #include <ostream>
 #include <sstream>
-#include <iostream>
-#include <iomanip>
-#include <type_traits>
 
 #define ZNET_BIND_FN(fn)                                    \
   [this](auto&&... args) -> decltype(auto) {                \
diff --git a/znet/include/znet/znet.h b/znet/include/znet/znet.h
deleted file mode 100644
index f37ad05..0000000
--- a/znet/include/znet/znet.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//    Copyright 2023 Metehan Gezer
-//
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#pragma once
-
-#include "znet/precompiled.h"
-#include "znet/interface.h"
-#include "znet/base/inet_addr.h"
-#include "znet/base/packet.h"
-#include "znet/packet_handler.h"
-#include "znet/packet_serializer.h"
-#include "znet/base/signal_handler.h"
-#include "znet/base/types.h"
-#include "znet/base/util.h"
-#include "znet/buffer.h"
-#include "znet/client.h"
-#include "znet/base/event.h"
-#include "znet/client_events.h"
-#include "znet/server_events.h"
-#include "znet/logger.h"
-#include "znet/server.h"
-#include "znet/peer_session.h"
-#include "znet/init.h"
-
-#include "znet/p2p/dialer.h"
-#include "znet/p2p/locator.h"
-#include "znet/p2p/rendezvous.h"
\ No newline at end of file
diff --git a/znet/src/inet_addr.cc b/znet/src/inet_addr.cc
index 252137c..06246db 100644
--- a/znet/src/inet_addr.cc
+++ b/znet/src/inet_addr.cc
@@ -8,10 +8,10 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include "znet/base/inet_addr.h"
+#include "znet/inet_addr.h"
 #include "znet/logger.h"
-
 #include "znet/init.h"
+
 #include <regex>
 
 namespace znet {
diff --git a/znet/src/p2p/dialer.cc b/znet/src/p2p/dialer.cc
index 354f12f..f1b6a65 100644
--- a/znet/src/p2p/dialer.cc
+++ b/znet/src/p2p/dialer.cc
@@ -13,8 +13,10 @@
 //
 
 #include "znet/p2p/dialer.h"
-#include "znet/transport.h"
+
 #include "znet/backends/tcp.h"
+#include "znet/error.h"
+#include "znet/transport.h"
 
 namespace znet {
 namespace p2p {
@@ -144,11 +146,10 @@ std::shared_ptr<PeerSession> PunchSyncTCP(const std::shared_ptr<InetAddress>& lo
                                              ConnectionType::TCP,
                                              is_initiator,
                                              true);
-      } else {
-        CloseSocket(socket_handle);
-        *out_result = Result::CannotConnect;
-        return nullptr;
       }
+      CloseSocket(socket_handle);
+      *out_result = Result::CannotConnect;
+      return nullptr;
     }
   }
 }
diff --git a/znet/src/peer_session.cc b/znet/src/peer_session.cc
index cec3b70..1dc4c90 100644
--- a/znet/src/peer_session.cc
+++ b/znet/src/peer_session.cc
@@ -8,9 +8,9 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include "znet/error.h"
 #include "znet/peer_session.h"
-#include "znet/base/scheduler.h"
+#include "znet/scheduler.h"
+#include "znet/error.h"
 
 #include <utility>
 
diff --git a/znet/src/scheduler.cc b/znet/src/scheduler.cc
index 586f0cd..861524a 100644
--- a/znet/src/scheduler.cc
+++ b/znet/src/scheduler.cc
@@ -8,7 +8,8 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include "znet/base/scheduler.h"
+#include "znet/scheduler.h"
+#include <thread>
 
 Scheduler::Scheduler(int tps) {
   SetTicksPerSecond(tps);
diff --git a/znet/src/signal_handler.cc b/znet/src/signal_handler.cc
index 60828d4..4081c88 100644
--- a/znet/src/signal_handler.cc
+++ b/znet/src/signal_handler.cc
@@ -8,7 +8,7 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include "znet/base/signal_handler.h"
+#include "znet/signal_handler.h"
 
 #include <utility>
 
diff --git a/znet/src/util.cc b/znet/src/util.cc
index 458c21e..1a93da9 100644
--- a/znet/src/util.cc
+++ b/znet/src/util.cc
@@ -8,11 +8,11 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include "znet/base/util.h"
+#include "znet/util.h"
 
+#include <random>
 #include <string>
 #include <vector>
-#include <random>
 
 namespace znet {