diff --git a/Tun/Punchnet/Actors/SDLNATProberActor.swift b/Tun/Actors/SDLNATProberActor.swift
similarity index 100%
rename from Tun/Punchnet/Actors/SDLNATProberActor.swift
rename to Tun/Actors/SDLNATProberActor.swift
diff --git a/Tun/Punchnet/Actors/SDLPuncherActor.swift b/Tun/Actors/SDLPuncherActor.swift
similarity index 100%
rename from Tun/Punchnet/Actors/SDLPuncherActor.swift
rename to Tun/Actors/SDLPuncherActor.swift
diff --git a/Tun/Punchnet/Arp/ArpResolver.swift b/Tun/Arp/ArpResolver.swift
similarity index 100%
rename from Tun/Punchnet/Arp/ArpResolver.swift
rename to Tun/Arp/ArpResolver.swift
diff --git a/Tun/Punchnet/Arp/ArpSnapshot.swift b/Tun/Arp/ArpSnapshot.swift
similarity index 100%
rename from Tun/Punchnet/Arp/ArpSnapshot.swift
rename to Tun/Arp/ArpSnapshot.swift
diff --git a/Tun/Punchnet/Cipher/CCAESChiper.swift b/Tun/Cipher/CCAESChiper.swift
similarity index 100%
rename from Tun/Punchnet/Cipher/CCAESChiper.swift
rename to Tun/Cipher/CCAESChiper.swift
diff --git a/Tun/Punchnet/Cipher/CCChaCha20Cipher.swift b/Tun/Cipher/CCChaCha20Cipher.swift
similarity index 100%
rename from Tun/Punchnet/Cipher/CCChaCha20Cipher.swift
rename to Tun/Cipher/CCChaCha20Cipher.swift
diff --git a/Tun/Punchnet/Cipher/CCDataCipher.swift b/Tun/Cipher/CCDataCipher.swift
similarity index 100%
rename from Tun/Punchnet/Cipher/CCDataCipher.swift
rename to Tun/Cipher/CCDataCipher.swift
diff --git a/Tun/Punchnet/Cipher/CCRSACipher.swift b/Tun/Cipher/CCRSACipher.swift
similarity index 100%
rename from Tun/Punchnet/Cipher/CCRSACipher.swift
rename to Tun/Cipher/CCRSACipher.swift
diff --git a/Tun/Punchnet/Cipher/RSACipher.swift b/Tun/Cipher/RSACipher.swift
similarity index 100%
rename from Tun/Punchnet/Cipher/RSACipher.swift
rename to Tun/Cipher/RSACipher.swift
diff --git a/Tun/Punchnet/Concurrency/AsyncOneShot.swift b/Tun/Concurrency/AsyncOneShot.swift
similarity index 100%
rename from Tun/Punchnet/Concurrency/AsyncOneShot.swift
rename to Tun/Concurrency/AsyncOneShot.swift
diff --git a/Tun/Punchnet/Concurrency/OnceContinuation.swift b/Tun/Concurrency/OnceContinuation.swift
similarity index 100%
rename from Tun/Punchnet/Concurrency/OnceContinuation.swift
rename to Tun/Concurrency/OnceContinuation.swift
diff --git a/Tun/Punchnet/Concurrency/PeriodicWorker.swift b/Tun/Concurrency/PeriodicWorker.swift
similarity index 100%
rename from Tun/Punchnet/Concurrency/PeriodicWorker.swift
rename to Tun/Concurrency/PeriodicWorker.swift
diff --git a/Tun/Punchnet/Context/SDLContextActor.swift b/Tun/Context/SDLContextActor.swift
similarity index 100%
rename from Tun/Punchnet/Context/SDLContextActor.swift
rename to Tun/Context/SDLContextActor.swift
diff --git a/Tun/Punchnet/Context/SDLSuperEventProcessor.swift b/Tun/Context/SDLSuperEventProcessor.swift
similarity index 100%
rename from Tun/Punchnet/Context/SDLSuperEventProcessor.swift
rename to Tun/Context/SDLSuperEventProcessor.swift
diff --git a/Tun/Punchnet/DNS/DNSCloudClient.swift b/Tun/DNS/DNSCloudClient.swift
similarity index 100%
rename from Tun/Punchnet/DNS/DNSCloudClient.swift
rename to Tun/DNS/DNSCloudClient.swift
diff --git a/Tun/Punchnet/DNS/DNSHelper.swift b/Tun/DNS/DNSHelper.swift
similarity index 100%
rename from Tun/Punchnet/DNS/DNSHelper.swift
rename to Tun/DNS/DNSHelper.swift
diff --git a/Tun/Punchnet/DNS/DNSLocalClient.swift b/Tun/DNS/DNSLocalClient.swift
similarity index 100%
rename from Tun/Punchnet/DNS/DNSLocalClient.swift
rename to Tun/DNS/DNSLocalClient.swift
diff --git a/Tun/Punchnet/DNS/DNSParser.swift b/Tun/DNS/DNSParser.swift
similarity index 100%
rename from Tun/Punchnet/DNS/DNSParser.swift
rename to Tun/DNS/DNSParser.swift
diff --git a/Tun/Punchnet/DNS/DNSService.swift b/Tun/DNS/DNSService.swift
similarity index 100%
rename from Tun/Punchnet/DNS/DNSService.swift
rename to Tun/DNS/DNSService.swift
diff --git a/Tun/Punchnet/DataExtension.swift b/Tun/DataExtension.swift
similarity index 100%
rename from Tun/Punchnet/DataExtension.swift
rename to Tun/DataExtension.swift
diff --git a/Tun/Punchnet/Inbound/PacketInboundActor.swift b/Tun/Inbound/PacketInboundActor.swift
similarity index 100%
rename from Tun/Punchnet/Inbound/PacketInboundActor.swift
rename to Tun/Inbound/PacketInboundActor.swift
diff --git a/Tun/Punchnet/Inbound/PacketInboundProcessor.swift b/Tun/Inbound/PacketInboundProcessor.swift
similarity index 100%
rename from Tun/Punchnet/Inbound/PacketInboundProcessor.swift
rename to Tun/Inbound/PacketInboundProcessor.swift
diff --git a/Tun/Punchnet/NWPath/SDLPathDebounceActor.swift b/Tun/NWPath/SDLPathDebounceActor.swift
similarity index 100%
rename from Tun/Punchnet/NWPath/SDLPathDebounceActor.swift
rename to Tun/NWPath/SDLPathDebounceActor.swift
diff --git a/Tun/Punchnet/NWPath/SDLPathMonitor.swift b/Tun/NWPath/SDLPathMonitor.swift
similarity index 100%
rename from Tun/Punchnet/NWPath/SDLPathMonitor.swift
rename to Tun/NWPath/SDLPathMonitor.swift
diff --git a/Tun/Punchnet/NWPath/SDLPathSnapshot.swift b/Tun/NWPath/SDLPathSnapshot.swift
similarity index 100%
rename from Tun/Punchnet/NWPath/SDLPathSnapshot.swift
rename to Tun/NWPath/SDLPathSnapshot.swift
diff --git a/Tun/Punchnet/NetworkStack/ARPPacket.swift b/Tun/NetworkStack/ARPPacket.swift
similarity index 100%
rename from Tun/Punchnet/NetworkStack/ARPPacket.swift
rename to Tun/NetworkStack/ARPPacket.swift
diff --git a/Tun/Punchnet/NetworkStack/IPPacket.swift b/Tun/NetworkStack/IPPacket.swift
similarity index 100%
rename from Tun/Punchnet/NetworkStack/IPPacket.swift
rename to Tun/NetworkStack/IPPacket.swift
diff --git a/Tun/Punchnet/NetworkStack/LayerPacket.swift b/Tun/NetworkStack/LayerPacket.swift
similarity index 100%
rename from Tun/Punchnet/NetworkStack/LayerPacket.swift
rename to Tun/NetworkStack/LayerPacket.swift
diff --git a/Tun/Punchnet/Outbound/PacketOutboundActor.swift b/Tun/Outbound/PacketOutboundActor.swift
similarity index 100%
rename from Tun/Punchnet/Outbound/PacketOutboundActor.swift
rename to Tun/Outbound/PacketOutboundActor.swift
diff --git a/Tun/Punchnet/Outbound/PacketOutboundRouter.swift b/Tun/Outbound/PacketOutboundRouter.swift
similarity index 100%
rename from Tun/Punchnet/Outbound/PacketOutboundRouter.swift
rename to Tun/Outbound/PacketOutboundRouter.swift
diff --git a/Tun/Punchnet/Policy/FlowSessionTable.swift b/Tun/Policy/FlowSessionTable.swift
similarity index 100%
rename from Tun/Punchnet/Policy/FlowSessionTable.swift
rename to Tun/Policy/FlowSessionTable.swift
diff --git a/Tun/Punchnet/Policy/PolicyRuleMap.swift b/Tun/Policy/PolicyRuleMap.swift
similarity index 100%
rename from Tun/Punchnet/Policy/PolicyRuleMap.swift
rename to Tun/Policy/PolicyRuleMap.swift
diff --git a/Tun/Punchnet/Policy/PolicyRuleSnapshot.swift b/Tun/Policy/PolicyRuleSnapshot.swift
similarity index 100%
rename from Tun/Punchnet/Policy/PolicyRuleSnapshot.swift
rename to Tun/Policy/PolicyRuleSnapshot.swift
diff --git a/Tun/Punchnet/Policy/PolicyRuleStore.swift b/Tun/Policy/PolicyRuleStore.swift
similarity index 100%
rename from Tun/Punchnet/Policy/PolicyRuleStore.swift
rename to Tun/Policy/PolicyRuleStore.swift
diff --git a/Tun/Punchnet/Policy/PolicyRuntime.swift b/Tun/Policy/PolicyRuntime.swift
similarity index 100%
rename from Tun/Punchnet/Policy/PolicyRuntime.swift
rename to Tun/Policy/PolicyRuntime.swift
diff --git a/Tun/Punchnet/Policy/PolicyService.swift b/Tun/Policy/PolicyService.swift
similarity index 100%
rename from Tun/Punchnet/Policy/PolicyService.swift
rename to Tun/Policy/PolicyService.swift
diff --git a/Tun/Punchnet/Protobuf/SDLMessage.pb.swift b/Tun/Protobuf/SDLMessage.pb.swift
similarity index 100%
rename from Tun/Punchnet/Protobuf/SDLMessage.pb.swift
rename to Tun/Protobuf/SDLMessage.pb.swift
diff --git a/Tun/Punchnet/Protobuf/SDLMessage.swift b/Tun/Protobuf/SDLMessage.swift
similarity index 100%
rename from Tun/Punchnet/Protobuf/SDLMessage.swift
rename to Tun/Protobuf/SDLMessage.swift
diff --git a/Tun/Punchnet/Protobuf/TunMessage.pb.swift b/Tun/Protobuf/TunMessage.pb.swift
similarity index 100%
rename from Tun/Punchnet/Protobuf/TunMessage.pb.swift
rename to Tun/Protobuf/TunMessage.pb.swift
diff --git a/Tun/Punchnet/SDLConfiguration.swift b/Tun/SDLConfiguration.swift
similarity index 100%
rename from Tun/Punchnet/SDLConfiguration.swift
rename to Tun/SDLConfiguration.swift
diff --git a/Tun/Punchnet/SDLError.swift b/Tun/SDLError.swift
similarity index 100%
rename from Tun/Punchnet/SDLError.swift
rename to Tun/SDLError.swift
diff --git a/Tun/Punchnet/SDLFlowTracer.swift b/Tun/SDLFlowTracer.swift
similarity index 100%
rename from Tun/Punchnet/SDLFlowTracer.swift
rename to Tun/SDLFlowTracer.swift
diff --git a/Tun/Punchnet/SDLIPV6AssistClient.swift b/Tun/SDLIPV6AssistClient.swift
similarity index 100%
rename from Tun/Punchnet/SDLIPV6AssistClient.swift
rename to Tun/SDLIPV6AssistClient.swift
diff --git a/Tun/Punchnet/SDLLogger.swift b/Tun/SDLLogger.swift
similarity index 100%
rename from Tun/Punchnet/SDLLogger.swift
rename to Tun/SDLLogger.swift
diff --git a/Tun/Punchnet/SDLNetworkMonitor.swift b/Tun/SDLNetworkMonitor.swift
similarity index 100%
rename from Tun/Punchnet/SDLNetworkMonitor.swift
rename to Tun/SDLNetworkMonitor.swift
diff --git a/Tun/Punchnet/SDLThrottler.swift b/Tun/SDLThrottler.swift
similarity index 100%
rename from Tun/Punchnet/SDLThrottler.swift
rename to Tun/SDLThrottler.swift
diff --git a/Tun/Punchnet/SDLTunnelAppNotifier.swift b/Tun/SDLTunnelAppNotifier.swift
similarity index 100%
rename from Tun/Punchnet/SDLTunnelAppNotifier.swift
rename to Tun/SDLTunnelAppNotifier.swift
diff --git a/Tun/Punchnet/SDLUtil.swift b/Tun/SDLUtil.swift
similarity index 100%
rename from Tun/Punchnet/SDLUtil.swift
rename to Tun/SDLUtil.swift
diff --git a/Tun/Punchnet/Session/Session.swift b/Tun/Session/Session.swift
similarity index 100%
rename from Tun/Punchnet/Session/Session.swift
rename to Tun/Session/Session.swift
diff --git a/Tun/Punchnet/Session/SessionSnapshot.swift b/Tun/Session/SessionSnapshot.swift
similarity index 100%
rename from Tun/Punchnet/Session/SessionSnapshot.swift
rename to Tun/Session/SessionSnapshot.swift
diff --git a/Tun/Punchnet/Session/SessionTable.swift b/Tun/Session/SessionTable.swift
similarity index 100%
rename from Tun/Punchnet/Session/SessionTable.swift
rename to Tun/Session/SessionTable.swift
diff --git a/Tun/Punchnet/Snapshot/Snapshot.swift b/Tun/Snapshot/Snapshot.swift
similarity index 100%
rename from Tun/Punchnet/Snapshot/Snapshot.swift
rename to Tun/Snapshot/Snapshot.swift
diff --git a/Tun/Punchnet/Snapshot/SnapshotPublisher.swift b/Tun/Snapshot/SnapshotPublisher.swift
similarity index 100%
rename from Tun/Punchnet/Snapshot/SnapshotPublisher.swift
rename to Tun/Snapshot/SnapshotPublisher.swift
diff --git a/Tun/Punchnet/Super/SDLSuperClient.swift b/Tun/Super/SDLSuperClient.swift
similarity index 100%
rename from Tun/Punchnet/Super/SDLSuperClient.swift
rename to Tun/Super/SDLSuperClient.swift
diff --git a/Tun/Punchnet/Super/SDLSuperService.swift b/Tun/Super/SDLSuperService.swift
similarity index 100%
rename from Tun/Punchnet/Super/SDLSuperService.swift
rename to Tun/Super/SDLSuperService.swift
diff --git a/Tun/Punchnet/TunNetwork/SDLTunNetworkManager.swift b/Tun/TunNetwork/SDLTunNetworkManager.swift
similarity index 100%
rename from Tun/Punchnet/TunNetwork/SDLTunNetworkManager.swift
rename to Tun/TunNetwork/SDLTunNetworkManager.swift
diff --git a/Tun/Punchnet/UDPHole/SDLHoleMessage.swift b/Tun/UDPHole/SDLHoleMessage.swift
similarity index 100%
rename from Tun/Punchnet/UDPHole/SDLHoleMessage.swift
rename to Tun/UDPHole/SDLHoleMessage.swift
diff --git a/Tun/Punchnet/UDPHole/SDLUDPHole.swift b/Tun/UDPHole/SDLUDPHole.swift
similarity index 100%
rename from Tun/Punchnet/UDPHole/SDLUDPHole.swift
rename to Tun/UDPHole/SDLUDPHole.swift
diff --git a/Tun/Punchnet/UDPHole/SDLUDPHoleService.swift b/Tun/UDPHole/SDLUDPHoleService.swift
similarity index 100%
rename from Tun/Punchnet/UDPHole/SDLUDPHoleService.swift
rename to Tun/UDPHole/SDLUDPHoleService.swift
diff --git a/Tun/Punchnet/UDPHole/SDLUDPHoleV6.swift b/Tun/UDPHole/SDLUDPHoleV6.swift
similarity index 100%
rename from Tun/Punchnet/UDPHole/SDLUDPHoleV6.swift
rename to Tun/UDPHole/SDLUDPHoleV6.swift
diff --git a/Tun/Punchnet/UIntExtension.swift b/Tun/UIntExtension.swift
similarity index 100%
rename from Tun/Punchnet/UIntExtension.swift
rename to Tun/UIntExtension.swift
diff --git a/punchnet.xcodeproj/project.pbxproj b/punchnet.xcodeproj/project.pbxproj
index c1c7b4a..9a4613d 100644
--- a/punchnet.xcodeproj/project.pbxproj
+++ b/punchnet.xcodeproj/project.pbxproj
@@ -76,7 +76,7 @@
 		C89D42E62F8F39B7001A17CF /* Exceptions for "Tun" folder in "punchnet" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				Punchnet/Protobuf/TunMessage.pb.swift,
+				Protobuf/TunMessage.pb.swift,
 			);
 			target = C8A77EF22DD1E6D000195617 /* punchnet */;
 		};