diff --git a/Configuration/OpenVPNAdapter.xcconfig b/Configuration/OpenVPNAdapter.xcconfig
index 6c5b0dc..9e44196 100644
--- a/Configuration/OpenVPNAdapter.xcconfig
+++ b/Configuration/OpenVPNAdapter.xcconfig
@@ -1,2 +1,3 @@
+MODULEMAP_FILE = Sources/OpenVPNAdapter/include/module.modulemap
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) USE_ASIO
 GCC_WARN_64_TO_32_BIT_CONVERSION = NO
diff --git a/Sources/OpenVPNAdapter/Umbrella-Header.h b/Sources/OpenVPNAdapter/include/Umbrella-Header.h
similarity index 100%
rename from Sources/OpenVPNAdapter/Umbrella-Header.h
rename to Sources/OpenVPNAdapter/include/Umbrella-Header.h
diff --git a/Configuration/OpenVPNAdapter.modulemap b/Sources/OpenVPNAdapter/include/module.modulemap
similarity index 100%
rename from Configuration/OpenVPNAdapter.modulemap
rename to Sources/OpenVPNAdapter/include/module.modulemap