diff --git a/Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.h b/Sources/OpenVPNAdapter/library/NSArray+OpenVPNAdditions.h
similarity index 100%
rename from Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.h
rename to Sources/OpenVPNAdapter/library/NSArray+OpenVPNAdditions.h
diff --git a/Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.m b/Sources/OpenVPNAdapter/library/NSArray+OpenVPNAdditions.m
similarity index 100%
rename from Sources/OpenVPNAdapter/NSArray+OpenVPNAdditions.m
rename to Sources/OpenVPNAdapter/library/NSArray+OpenVPNAdditions.m
diff --git a/Sources/OpenVPNAdapter/NSError+OpenVPNError.h b/Sources/OpenVPNAdapter/library/NSError+OpenVPNError.h
similarity index 100%
rename from Sources/OpenVPNAdapter/NSError+OpenVPNError.h
rename to Sources/OpenVPNAdapter/library/NSError+OpenVPNError.h
diff --git a/Sources/OpenVPNAdapter/NSError+OpenVPNError.m b/Sources/OpenVPNAdapter/library/NSError+OpenVPNError.m
similarity index 100%
rename from Sources/OpenVPNAdapter/NSError+OpenVPNError.m
rename to Sources/OpenVPNAdapter/library/NSError+OpenVPNError.m
diff --git a/Sources/OpenVPNAdapter/OpenVPNAdapter.h b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNAdapter.h
rename to Sources/OpenVPNAdapter/library/OpenVPNAdapter.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNAdapter.mm b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNAdapter.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNAdapterEvent.h b/Sources/OpenVPNAdapter/library/OpenVPNAdapterEvent.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNAdapterEvent.h
rename to Sources/OpenVPNAdapter/library/OpenVPNAdapterEvent.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNAdapterPacketFlow.h b/Sources/OpenVPNAdapter/library/OpenVPNAdapterPacketFlow.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNAdapterPacketFlow.h
rename to Sources/OpenVPNAdapter/library/OpenVPNAdapterPacketFlow.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNCertificate.h b/Sources/OpenVPNAdapter/library/OpenVPNCertificate.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCertificate.h
rename to Sources/OpenVPNAdapter/library/OpenVPNCertificate.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNCertificate.m b/Sources/OpenVPNAdapter/library/OpenVPNCertificate.m
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCertificate.m
rename to Sources/OpenVPNAdapter/library/OpenVPNCertificate.m
diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.h b/Sources/OpenVPNAdapter/library/OpenVPNClient.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNClient.h
rename to Sources/OpenVPNAdapter/library/OpenVPNClient.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.mm b/Sources/OpenVPNAdapter/library/OpenVPNClient.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNClient.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNClient.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNCompressionMode.h b/Sources/OpenVPNAdapter/library/OpenVPNCompressionMode.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCompressionMode.h
rename to Sources/OpenVPNAdapter/library/OpenVPNCompressionMode.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNConfiguration+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConfiguration+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNConfiguration+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNConfiguration.h b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConfiguration.h
rename to Sources/OpenVPNAdapter/library/OpenVPNConfiguration.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNConfiguration.mm b/Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConfiguration.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNConfiguration.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNConnectionInfo+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConnectionInfo+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNConnectionInfo.h b/Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConnectionInfo.h
rename to Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNConnectionInfo.mm b/Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNConnectionInfo.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNConnectionInfo.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNCredentials+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNCredentials+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCredentials+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNCredentials+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNCredentials.h b/Sources/OpenVPNAdapter/library/OpenVPNCredentials.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCredentials.h
rename to Sources/OpenVPNAdapter/library/OpenVPNCredentials.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNCredentials.mm b/Sources/OpenVPNAdapter/library/OpenVPNCredentials.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNCredentials.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNCredentials.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNError.h b/Sources/OpenVPNAdapter/library/OpenVPNError.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNError.h
rename to Sources/OpenVPNAdapter/library/OpenVPNError.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNError.m b/Sources/OpenVPNAdapter/library/OpenVPNError.m
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNError.m
rename to Sources/OpenVPNAdapter/library/OpenVPNError.m
diff --git a/Sources/OpenVPNAdapter/OpenVPNIPv6Preference.h b/Sources/OpenVPNAdapter/library/OpenVPNIPv6Preference.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNIPv6Preference.h
rename to Sources/OpenVPNAdapter/library/OpenVPNIPv6Preference.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNInterfaceStats+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNInterfaceStats+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNInterfaceStats.h b/Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNInterfaceStats.h
rename to Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNInterfaceStats.mm b/Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNInterfaceStats.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNInterfaceStats.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNKeyType.h b/Sources/OpenVPNAdapter/library/OpenVPNKeyType.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNKeyType.h
rename to Sources/OpenVPNAdapter/library/OpenVPNKeyType.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNMinTLSVersion.h b/Sources/OpenVPNAdapter/library/OpenVPNMinTLSVersion.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNMinTLSVersion.h
rename to Sources/OpenVPNAdapter/library/OpenVPNMinTLSVersion.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.h b/Sources/OpenVPNAdapter/library/OpenVPNNetworkSettingsBuilder.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.h
rename to Sources/OpenVPNAdapter/library/OpenVPNNetworkSettingsBuilder.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.m b/Sources/OpenVPNAdapter/library/OpenVPNNetworkSettingsBuilder.m
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.m
rename to Sources/OpenVPNAdapter/library/OpenVPNNetworkSettingsBuilder.m
diff --git a/Sources/OpenVPNAdapter/OpenVPNPacket.h b/Sources/OpenVPNAdapter/library/OpenVPNPacket.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPacket.h
rename to Sources/OpenVPNAdapter/library/OpenVPNPacket.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNPacket.mm b/Sources/OpenVPNAdapter/library/OpenVPNPacket.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPacket.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNPacket.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNPacketFlowBridge.h b/Sources/OpenVPNAdapter/library/OpenVPNPacketFlowBridge.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPacketFlowBridge.h
rename to Sources/OpenVPNAdapter/library/OpenVPNPacketFlowBridge.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNPacketFlowBridge.mm b/Sources/OpenVPNAdapter/library/OpenVPNPacketFlowBridge.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPacketFlowBridge.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNPacketFlowBridge.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNPrivateKey.h b/Sources/OpenVPNAdapter/library/OpenVPNPrivateKey.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPrivateKey.h
rename to Sources/OpenVPNAdapter/library/OpenVPNPrivateKey.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNPrivateKey.m b/Sources/OpenVPNAdapter/library/OpenVPNPrivateKey.m
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNPrivateKey.m
rename to Sources/OpenVPNAdapter/library/OpenVPNPrivateKey.m
diff --git a/Sources/OpenVPNAdapter/OpenVPNProperties+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNProperties+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNProperties+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNProperties+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNProperties.h b/Sources/OpenVPNAdapter/library/OpenVPNProperties.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNProperties.h
rename to Sources/OpenVPNAdapter/library/OpenVPNProperties.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNProperties.mm b/Sources/OpenVPNAdapter/library/OpenVPNProperties.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNProperties.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNProperties.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachability+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNReachability+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachability+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNReachability+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachability.h b/Sources/OpenVPNAdapter/library/OpenVPNReachability.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachability.h
rename to Sources/OpenVPNAdapter/library/OpenVPNReachability.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachability.mm b/Sources/OpenVPNAdapter/library/OpenVPNReachability.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachability.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNReachability.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachabilityStatus.h b/Sources/OpenVPNAdapter/library/OpenVPNReachabilityStatus.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachabilityStatus.h
rename to Sources/OpenVPNAdapter/library/OpenVPNReachabilityStatus.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachabilityTracker.h b/Sources/OpenVPNAdapter/library/OpenVPNReachabilityTracker.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachabilityTracker.h
rename to Sources/OpenVPNAdapter/library/OpenVPNReachabilityTracker.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNReachabilityTracker.mm b/Sources/OpenVPNAdapter/library/OpenVPNReachabilityTracker.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNReachabilityTracker.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNReachabilityTracker.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNServerEntry+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNServerEntry+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNServerEntry+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNServerEntry+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNServerEntry.h b/Sources/OpenVPNAdapter/library/OpenVPNServerEntry.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNServerEntry.h
rename to Sources/OpenVPNAdapter/library/OpenVPNServerEntry.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNServerEntry.mm b/Sources/OpenVPNAdapter/library/OpenVPNServerEntry.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNServerEntry.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNServerEntry.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNSessionToken+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNSessionToken+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNSessionToken+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNSessionToken+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNSessionToken.h b/Sources/OpenVPNAdapter/library/OpenVPNSessionToken.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNSessionToken.h
rename to Sources/OpenVPNAdapter/library/OpenVPNSessionToken.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNSessionToken.mm b/Sources/OpenVPNAdapter/library/OpenVPNSessionToken.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNSessionToken.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNSessionToken.mm
diff --git a/Sources/OpenVPNAdapter/OpenVPNTLSCertProfile.h b/Sources/OpenVPNAdapter/library/OpenVPNTLSCertProfile.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNTLSCertProfile.h
rename to Sources/OpenVPNAdapter/library/OpenVPNTLSCertProfile.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNTransportProtocol.h b/Sources/OpenVPNAdapter/library/OpenVPNTransportProtocol.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNTransportProtocol.h
rename to Sources/OpenVPNAdapter/library/OpenVPNTransportProtocol.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNTransportStats+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNTransportStats+Internal.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNTransportStats+Internal.h
rename to Sources/OpenVPNAdapter/library/OpenVPNTransportStats+Internal.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNTransportStats.h b/Sources/OpenVPNAdapter/library/OpenVPNTransportStats.h
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNTransportStats.h
rename to Sources/OpenVPNAdapter/library/OpenVPNTransportStats.h
diff --git a/Sources/OpenVPNAdapter/OpenVPNTransportStats.mm b/Sources/OpenVPNAdapter/library/OpenVPNTransportStats.mm
similarity index 100%
rename from Sources/OpenVPNAdapter/OpenVPNTransportStats.mm
rename to Sources/OpenVPNAdapter/library/OpenVPNTransportStats.mm