diff --git a/Package.resolved b/Package.resolved
index 5b233429..677a6086 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -3,10 +3,10 @@
     "pins": [
       {
         "package": "abseil",
-        "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git",
+        "repositoryURL": "https://github.com/bourdakos1/abseil-cpp-SwiftPM.git",
         "state": {
-          "branch": "main",
-          "revision": "06e7506b74bfc47c70f3353e2927ea3e2275230c",
+          "branch": "cxx17",
+          "revision": "a7042563d167160f56e614cd1e2a32616510d9ec",
           "version": null
         }
       },
@@ -22,4 +22,4 @@
     ]
   },
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/Package.swift b/Package.swift
index 941fec31..ec463cfc 100644
--- a/Package.swift
+++ b/Package.swift
@@ -168,69 +168,30 @@ let package = Package(
         .headerSearchPath("smhasher/src/")
       ]
     ),
-    .target(
-      name: "securemessage",
-      dependencies: [
-        "protobuf",
-        .product(name: "openssl_grpc", package: "BoringSSL-GRPC"),
-      ],
-      path: "third_party/securemessage",
-      exclude: [
-        "securemessage/cmake",
-        "securemessage/cpp/src/securemessage/CMakeLists.txt",
-        "securemessage/cpp/test",
-        "securemessage/cpp/CMakeLists.txt",
-        "securemessage/cpp/Makefile",
-        "securemessage/cpp/README.md",
-        "securemessage/java",
-        "securemessage/js",
-        "securemessage/proto",
-        "securemessage/third_party",
-        "securemessage/CMakeLists.txt",
-        "securemessage/CONTRIBUTORS",
-        "securemessage/CONTRIBUTING.md",
-        "securemessage/LICENSE",
-        "securemessage/README.md",
-      ],
-      sources: [
-        "securemessage/cpp/src/securemessage",
-        "compiled_proto",
-      ],
-      publicHeadersPath: "include",
-      cSettings: [
-        .headerSearchPath("securemessage/cpp/include/"),
-        .headerSearchPath("compiled_proto/"),
-      ]
-    ),
     .target(
       name: "ukey2",
       dependencies: [
-        "securemessage",
         "protobuf",
         .product(name: "abseil", package: "abseil"),
+        .product(name: "openssl_grpc", package: "BoringSSL-GRPC"),
       ],
       path: "third_party/ukey2",
       exclude: [
-        "ukey2/cmake",
-        "ukey2/src/main/cpp/src/securegcm/CMakeLists.txt",
         "ukey2/src/main/cpp/src/securegcm/ukey2_shell.cc",
         "ukey2/src/main/cpp/test",
-        "ukey2/src/main/cpp/CMakeLists.txt",
         "ukey2/src/main/java",
         "ukey2/src/main/javatest",
         "ukey2/src/main/proto",
-        "ukey2/src/main/CMakeLists.txt",
         "ukey2/third_party",
         "ukey2/Android.bp",
         "ukey2/build.gradle",
-        "ukey2/CMakeLists.txt",
         "ukey2/CONTRIBUTING.md",
         "ukey2/LICENSE",
         "ukey2/MODULE_LICENSE_APACHE2",
         "ukey2/NOTICE",
         "ukey2/README",
         "ukey2/README.md",
-        "compiled_proto/proto/securemessage.pb.cc",
+        "compiled_proto/src/main/proto/securemessage.pb.cc",
       ],
       sources: [
         "ukey2/src/main/cpp/src/securegcm",
@@ -238,8 +199,9 @@ let package = Package(
       ],
       publicHeadersPath: "include",
       cSettings: [
-        .headerSearchPath("ukey2/src/main/cpp/include/"),
+        .headerSearchPath("ukey2/"),
         .headerSearchPath("compiled_proto/"),
+        .headerSearchPath("compiled_proto/src/main/"),
       ]
     ),
     .target(
@@ -605,6 +567,8 @@ let package = Package(
       cSettings: [
         .headerSearchPath("./"),
         .headerSearchPath("compiled_proto/"),
+        .headerSearchPath("third_party/ukey2/ukey2/"),
+        .headerSearchPath("third_party/ukey2/compiled_proto/"),
         .define("NO_WEBRTC"),
         .define("NEARBY_SWIFTPM"),
       ]
diff --git a/third_party/ukey2/compiled_proto/proto/device_to_device_messages.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/device_to_device_messages.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/device_to_device_messages.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/device_to_device_messages.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/device_to_device_messages.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/device_to_device_messages.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/device_to_device_messages.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/device_to_device_messages.pb.h
diff --git a/third_party/ukey2/compiled_proto/proto/passwordless_auth_payloads.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/passwordless_auth_payloads.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/passwordless_auth_payloads.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/passwordless_auth_payloads.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/passwordless_auth_payloads.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/passwordless_auth_payloads.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/passwordless_auth_payloads.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/passwordless_auth_payloads.pb.h
diff --git a/third_party/ukey2/compiled_proto/proto/proximity_payloads.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/proximity_payloads.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/proximity_payloads.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/proximity_payloads.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/proximity_payloads.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/proximity_payloads.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/proximity_payloads.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/proximity_payloads.pb.h
diff --git a/third_party/ukey2/compiled_proto/proto/securegcm.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/securegcm.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/securegcm.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/securegcm.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/securegcm.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/securegcm.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/securegcm.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/securegcm.pb.h
diff --git a/third_party/ukey2/compiled_proto/proto/securemessage.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/securemessage.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/securemessage.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/securemessage.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/securemessage.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/securemessage.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/securemessage.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/securemessage.pb.h
diff --git a/third_party/ukey2/compiled_proto/proto/ukey.pb.cc b/third_party/ukey2/compiled_proto/src/main/proto/ukey.pb.cc
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/ukey.pb.cc
rename to third_party/ukey2/compiled_proto/src/main/proto/ukey.pb.cc
diff --git a/third_party/ukey2/compiled_proto/proto/ukey.pb.h b/third_party/ukey2/compiled_proto/src/main/proto/ukey.pb.h
similarity index 100%
rename from third_party/ukey2/compiled_proto/proto/ukey.pb.h
rename to third_party/ukey2/compiled_proto/src/main/proto/ukey.pb.h