diff --git a/Package.swift b/Package.swift
index 12ab2ec8..44a10d3b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -79,7 +79,8 @@ let package = Package(
     ],
     products: [
         .library(name: "Crypto", targets: ["Crypto"]),
-        .library(name: "_CryptoExtras", targets: ["_CryptoExtras"]),
+        .library(name: "_CryptoExtras", targets: ["CryptoExtras"]),
+        .library(name: "CryptoExtras", targets: ["CryptoExtras"]),
         /* This target is used only for symbol mangling. It's added and removed automatically because it emits build warnings. MANGLE_START
             .library(name: "CCryptoBoringSSL", type: .static, targets: ["CCryptoBoringSSL"]),
             MANGLE_END */
@@ -138,7 +139,7 @@ let package = Package(
             swiftSettings: swiftSettings
         ),
         .target(
-            name: "_CryptoExtras",
+            name: "CryptoExtras",
             dependencies: [
                 "CCryptoBoringSSL",
                 "CCryptoBoringSSLShims",
@@ -172,7 +173,7 @@ let package = Package(
             ],
             swiftSettings: swiftSettings
         ),
-        .testTarget(name: "_CryptoExtrasTests", dependencies: ["_CryptoExtras"]),
+        .testTarget(name: "CryptoExtrasTests", dependencies: ["CryptoExtras"]),
         .testTarget(name: "CryptoBoringWrapperTests", dependencies: ["CryptoBoringWrapper"]),
     ],
     cxxLanguageStandard: .cxx11
diff --git a/README.md b/README.md
index 9a72b1c3..5edd355e 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ When building Swift Crypto for use on Linux, Swift Crypto builds substantially m
 2. The common API of Swift Crypto and CryptoKit.
 3. The backing implementation of this common API, which calls into BoringSSL.
 
-The API code, and some cryptographic primitives which are directly implemented in Swift, are exactly the same for both Apple CryptoKit and Swift Crypto. The backing BoringSSL-based implementation is unique to Swift Crypto.
+The API code, and some cryptographic primitives which are directly implemented in Swift, are exactly the same for both Apple CryptoKit and Swift Crypto. The backing BoringSSL-based implementation is unique to Swift Crypto. In addition, there is another product, `CryptoExtras`, which provides additional functionality that is not offered in CryptoKit, which contains cryptographic APIS predominantly useful in the server ecosystem. **Note**: if you depend on CryptoExtras you'll bundle the BoringSSL implementation of the library in your application, no matter the platform.
 
 ## Evolution
 
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index 0b6c1643..be79511b 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -16,4 +16,4 @@ add_subdirectory(CCryptoBoringSSL)
 add_subdirectory(CCryptoBoringSSLShims)
 add_subdirectory(CryptoBoringWrapper)
 add_subdirectory(Crypto)
-add_subdirectory(_CryptoExtras)
+add_subdirectory(CryptoExtras)
diff --git a/Sources/_CryptoExtras/AES/AES_CBC.swift b/Sources/CryptoExtras/AES/AES_CBC.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/AES_CBC.swift
rename to Sources/CryptoExtras/AES/AES_CBC.swift
diff --git a/Sources/_CryptoExtras/AES/AES_CFB.swift b/Sources/CryptoExtras/AES/AES_CFB.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/AES_CFB.swift
rename to Sources/CryptoExtras/AES/AES_CFB.swift
diff --git a/Sources/_CryptoExtras/AES/AES_CTR.swift b/Sources/CryptoExtras/AES/AES_CTR.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/AES_CTR.swift
rename to Sources/CryptoExtras/AES/AES_CTR.swift
diff --git a/Sources/_CryptoExtras/AES/AES_GCM_SIV.swift b/Sources/CryptoExtras/AES/AES_GCM_SIV.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/AES_GCM_SIV.swift
rename to Sources/CryptoExtras/AES/AES_GCM_SIV.swift
diff --git a/Sources/_CryptoExtras/AES/Block Function.swift b/Sources/CryptoExtras/AES/Block Function.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/Block Function.swift
rename to Sources/CryptoExtras/AES/Block Function.swift
diff --git a/Sources/_CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
rename to Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
diff --git a/Sources/_CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
rename to Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
diff --git a/Sources/_CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
rename to Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
diff --git a/Sources/_CryptoExtras/CMakeLists.txt b/Sources/CryptoExtras/CMakeLists.txt
similarity index 78%
rename from Sources/_CryptoExtras/CMakeLists.txt
rename to Sources/CryptoExtras/CMakeLists.txt
index eef4376d..e8d12c35 100644
--- a/Sources/_CryptoExtras/CMakeLists.txt
+++ b/Sources/CryptoExtras/CMakeLists.txt
@@ -12,7 +12,7 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-add_library(_CryptoExtras
+add_library(CryptoExtras
   "ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift"
   "ChaCha20CTR/ChaCha20CTR.swift"
   "RSA/RSA+BlindSigning.swift"
@@ -27,23 +27,23 @@ add_library(_CryptoExtras
   "Util/RandomBytes.swift"
   "Util/SubjectPublicKeyInfo.swift")
 
-target_include_directories(_CryptoExtras PRIVATE
+target_include_directories(CryptoExtras PRIVATE
   $<TARGET_PROPERTY:CCryptoBoringSSL,INCLUDE_DIRECTORIES>
   $<TARGET_PROPERTY:CCryptoBoringSSLShims,INCLUDE_DIRECTORIES>)
 
-target_link_libraries(_CryptoExtras PUBLIC
+target_link_libraries(CryptoExtras PUBLIC
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
   Crypto
   CryptoBoringWrapper
   CCryptoBoringSSL
   CCryptoBoringSSLShims)
 
-target_compile_options(_CryptoExtras PRIVATE ${SWIFT_CRYPTO_COMPILE_OPTIONS})
+target_compile_options(CryptoExtras PRIVATE ${SWIFT_CRYPTO_COMPILE_OPTIONS})
 
-target_link_options(_CryptoExtras PRIVATE
+target_link_options(CryptoExtras PRIVATE
     "$<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>")
 
-set_target_properties(_CryptoExtras PROPERTIES
+set_target_properties(CryptoExtras PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 
-set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS _CryptoExtras)
+set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS CryptoExtras)
diff --git a/Sources/_CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift b/Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
rename to Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
diff --git a/Sources/_CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift b/Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
similarity index 100%
rename from Sources/_CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
rename to Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
diff --git a/Sources/_CryptoExtras/PrivacyInfo.xcprivacy b/Sources/CryptoExtras/PrivacyInfo.xcprivacy
similarity index 100%
rename from Sources/_CryptoExtras/PrivacyInfo.xcprivacy
rename to Sources/CryptoExtras/PrivacyInfo.xcprivacy
diff --git a/Sources/_CryptoExtras/RSA/RSA+BlindSigning.swift b/Sources/CryptoExtras/RSA/RSA+BlindSigning.swift
similarity index 100%
rename from Sources/_CryptoExtras/RSA/RSA+BlindSigning.swift
rename to Sources/CryptoExtras/RSA/RSA+BlindSigning.swift
diff --git a/Sources/_CryptoExtras/RSA/RSA.swift b/Sources/CryptoExtras/RSA/RSA.swift
similarity index 100%
rename from Sources/_CryptoExtras/RSA/RSA.swift
rename to Sources/CryptoExtras/RSA/RSA.swift
diff --git a/Sources/_CryptoExtras/RSA/RSA_boring.swift b/Sources/CryptoExtras/RSA/RSA_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/RSA/RSA_boring.swift
rename to Sources/CryptoExtras/RSA/RSA_boring.swift
diff --git a/Sources/_CryptoExtras/RSA/RSA_security.swift b/Sources/CryptoExtras/RSA/RSA_security.swift
similarity index 100%
rename from Sources/_CryptoExtras/RSA/RSA_security.swift
rename to Sources/CryptoExtras/RSA/RSA_security.swift
diff --git a/Sources/_CryptoExtras/Util/BoringSSLHelpers.swift b/Sources/CryptoExtras/Util/BoringSSLHelpers.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/BoringSSLHelpers.swift
rename to Sources/CryptoExtras/Util/BoringSSLHelpers.swift
diff --git a/Sources/_CryptoExtras/Util/CryptoKitErrors_boring.swift b/Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/CryptoKitErrors_boring.swift
rename to Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift
diff --git a/Sources/_CryptoExtras/Util/DigestType.swift b/Sources/CryptoExtras/Util/DigestType.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/DigestType.swift
rename to Sources/CryptoExtras/Util/DigestType.swift
diff --git a/Sources/_CryptoExtras/Util/Error.swift b/Sources/CryptoExtras/Util/Error.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/Error.swift
rename to Sources/CryptoExtras/Util/Error.swift
diff --git a/Sources/_CryptoExtras/Util/PEMDocument.swift b/Sources/CryptoExtras/Util/PEMDocument.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/PEMDocument.swift
rename to Sources/CryptoExtras/Util/PEMDocument.swift
diff --git a/Sources/_CryptoExtras/Util/RandomBytes.swift b/Sources/CryptoExtras/Util/RandomBytes.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/RandomBytes.swift
rename to Sources/CryptoExtras/Util/RandomBytes.swift
diff --git a/Sources/_CryptoExtras/Util/SubjectPublicKeyInfo.swift b/Sources/CryptoExtras/Util/SubjectPublicKeyInfo.swift
similarity index 100%
rename from Sources/_CryptoExtras/Util/SubjectPublicKeyInfo.swift
rename to Sources/CryptoExtras/Util/SubjectPublicKeyInfo.swift
diff --git a/Tests/_CryptoExtrasTests/AES Block Function Tests.swift b/Tests/CryptoExtrasTests/AES Block Function Tests.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/AES Block Function Tests.swift
rename to Tests/CryptoExtrasTests/AES Block Function Tests.swift
index 776962d4..49819226 100644
--- a/Tests/_CryptoExtrasTests/AES Block Function Tests.swift	
+++ b/Tests/CryptoExtrasTests/AES Block Function Tests.swift	
@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 final class AESBlockFunctionTests: XCTestCase {
     static let nistPlaintextChunks: [[UInt8]] = [
diff --git a/Tests/_CryptoExtrasTests/AES-GCM-SIV-Runner.swift b/Tests/CryptoExtrasTests/AES-GCM-SIV-Runner.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/AES-GCM-SIV-Runner.swift
rename to Tests/CryptoExtrasTests/AES-GCM-SIV-Runner.swift
index 227e73c3..c32ed654 100644
--- a/Tests/_CryptoExtrasTests/AES-GCM-SIV-Runner.swift
+++ b/Tests/CryptoExtrasTests/AES-GCM-SIV-Runner.swift
@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 struct AEADTestGroup: Codable {
     let ivSize: Int
diff --git a/Tests/_CryptoExtrasTests/AES_CBCTests.swift b/Tests/CryptoExtrasTests/AES_CBCTests.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/AES_CBCTests.swift
rename to Tests/CryptoExtrasTests/AES_CBCTests.swift
index b42131c6..533ca9c2 100644
--- a/Tests/_CryptoExtrasTests/AES_CBCTests.swift
+++ b/Tests/CryptoExtrasTests/AES_CBCTests.swift
@@ -14,7 +14,7 @@
 
 import Crypto
 import Foundation
-import _CryptoExtras
+import CryptoExtras
 import XCTest
 
 final class CBCTests: XCTestCase {
diff --git a/Tests/_CryptoExtrasTests/AES_CFBTests.swift b/Tests/CryptoExtrasTests/AES_CFBTests.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/AES_CFBTests.swift
rename to Tests/CryptoExtrasTests/AES_CFBTests.swift
index 492a4541..14a58d19 100644
--- a/Tests/_CryptoExtrasTests/AES_CFBTests.swift
+++ b/Tests/CryptoExtrasTests/AES_CFBTests.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Crypto
-@testable import _CryptoExtras
+@testable import CryptoExtras
 import XCTest
 
 final class AES_CFBTests: XCTestCase {
diff --git a/Tests/_CryptoExtrasTests/AES_CTRTests.swift b/Tests/CryptoExtrasTests/AES_CTRTests.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/AES_CTRTests.swift
rename to Tests/CryptoExtrasTests/AES_CTRTests.swift
index e154b9b4..477b6e61 100644
--- a/Tests/_CryptoExtrasTests/AES_CTRTests.swift
+++ b/Tests/CryptoExtrasTests/AES_CTRTests.swift
@@ -14,7 +14,7 @@
 
 import Crypto
 import Foundation
-@testable import _CryptoExtras
+@testable import CryptoExtras
 import XCTest
 
 final class AESCTRTests: XCTestCase {
diff --git a/Tests/_CryptoExtrasTests/ChaCha20CTRTests.swift b/Tests/CryptoExtrasTests/ChaCha20CTRTests.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/ChaCha20CTRTests.swift
rename to Tests/CryptoExtrasTests/ChaCha20CTRTests.swift
index b86bfcaa..266c74a9 100644
--- a/Tests/_CryptoExtrasTests/ChaCha20CTRTests.swift
+++ b/Tests/CryptoExtrasTests/ChaCha20CTRTests.swift
@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 class ChaCha20CTRTests: XCTestCase {
 
diff --git a/Tests/_CryptoExtrasTests/TestRSABlindSigning.swift b/Tests/CryptoExtrasTests/TestRSABlindSigning.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/TestRSABlindSigning.swift
rename to Tests/CryptoExtrasTests/TestRSABlindSigning.swift
index fa42b2ee..547cc589 100644
--- a/Tests/_CryptoExtrasTests/TestRSABlindSigning.swift
+++ b/Tests/CryptoExtrasTests/TestRSABlindSigning.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import Crypto
-@testable import _CryptoExtras
+@testable import CryptoExtras
 
 struct RFC9474TestVector: Codable {
     var name, p, q, n, e, d, msg, msg_prefix, prepared_msg, salt, inv, blinded_msg, blind_sig, sig: String
@@ -42,7 +42,7 @@ struct RFC9474TestVector: Codable {
     }
 
     static let allValues: [Self] = try! RFC9474TestVector.load(from: URL(
-        fileURLWithPath: "../_CryptoExtrasVectors/rfc9474.json",
+        fileURLWithPath: "../CryptoExtrasVectors/rfc9474.json",
         relativeTo: URL(fileURLWithPath: #file)
     ))
 }
diff --git a/Tests/_CryptoExtrasTests/TestRSABlindSigningAPI.swift b/Tests/CryptoExtrasTests/TestRSABlindSigningAPI.swift
similarity index 96%
rename from Tests/_CryptoExtrasTests/TestRSABlindSigningAPI.swift
rename to Tests/CryptoExtrasTests/TestRSABlindSigningAPI.swift
index 413d1855..50699934 100644
--- a/Tests/_CryptoExtrasTests/TestRSABlindSigningAPI.swift
+++ b/Tests/CryptoExtrasTests/TestRSABlindSigningAPI.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import Crypto
-import _CryptoExtras  // NOTE: No @testable import, because we want to test the public API.
+import CryptoExtras  // NOTE: No @testable import, because we want to test the public API.
 
 final class TestRSABlindSigningAPI: XCTestCase {
     func testEndToEnd() throws {
diff --git a/Tests/_CryptoExtrasTests/TestRSAEncryption.swift b/Tests/CryptoExtrasTests/TestRSAEncryption.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/TestRSAEncryption.swift
rename to Tests/CryptoExtrasTests/TestRSAEncryption.swift
index 63ad1e0f..6f318de8 100644
--- a/Tests/_CryptoExtrasTests/TestRSAEncryption.swift
+++ b/Tests/CryptoExtrasTests/TestRSAEncryption.swift
@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 final class TestRSAEncryption: XCTestCase {
     
diff --git a/Tests/_CryptoExtrasTests/TestRSASigning.swift b/Tests/CryptoExtrasTests/TestRSASigning.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/TestRSASigning.swift
rename to Tests/CryptoExtrasTests/TestRSASigning.swift
index 07da7c12..9bf2cf2e 100644
--- a/Tests/_CryptoExtrasTests/TestRSASigning.swift
+++ b/Tests/CryptoExtrasTests/TestRSASigning.swift
@@ -15,7 +15,7 @@ import Foundation
 import XCTest
 import Crypto
 import CryptoBoringWrapper
-@testable import _CryptoExtras
+@testable import CryptoExtras
 
 final class TestRSASigning: XCTestCase {
 
diff --git a/Tests/_CryptoExtrasTests/Utils/BytesUtil.swift b/Tests/CryptoExtrasTests/Utils/BytesUtil.swift
similarity index 100%
rename from Tests/_CryptoExtrasTests/Utils/BytesUtil.swift
rename to Tests/CryptoExtrasTests/Utils/BytesUtil.swift
diff --git a/Tests/_CryptoExtrasTests/Utils/RFCVector.swift b/Tests/CryptoExtrasTests/Utils/RFCVector.swift
similarity index 99%
rename from Tests/_CryptoExtrasTests/Utils/RFCVector.swift
rename to Tests/CryptoExtrasTests/Utils/RFCVector.swift
index 52c52e9e..28781cf4 100644
--- a/Tests/_CryptoExtrasTests/Utils/RFCVector.swift
+++ b/Tests/CryptoExtrasTests/Utils/RFCVector.swift
@@ -26,7 +26,7 @@ struct RFCVectorDecoder {
 
     init(bundleType: AnyObject, fileName: String) throws {
         let testsDirectory: String = URL(fileURLWithPath: "\(#file)").pathComponents.dropLast(3).joined(separator: "/")
-        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/_CryptoExtrasVectors/\(fileName).txt")
+        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/CryptoExtrasVectors/\(fileName).txt")
 
         let rfcVectorData = try Data(contentsOf: fileURL!)
         self.rfcVectorData = String(decoding: rfcVectorData, as: Unicode.UTF8.self)
diff --git a/Tests/_CryptoExtrasTests/Utils/SplitData.swift b/Tests/CryptoExtrasTests/Utils/SplitData.swift
similarity index 100%
rename from Tests/_CryptoExtrasTests/Utils/SplitData.swift
rename to Tests/CryptoExtrasTests/Utils/SplitData.swift
diff --git a/Tests/_CryptoExtrasTests/Utils/Wycheproof.swift b/Tests/CryptoExtrasTests/Utils/Wycheproof.swift
similarity index 96%
rename from Tests/_CryptoExtrasTests/Utils/Wycheproof.swift
rename to Tests/CryptoExtrasTests/Utils/Wycheproof.swift
index 838a9a8b..b1c883f3 100644
--- a/Tests/_CryptoExtrasTests/Utils/Wycheproof.swift
+++ b/Tests/CryptoExtrasTests/Utils/Wycheproof.swift
@@ -22,7 +22,7 @@ struct WycheproofTest<T: Codable>: Codable {
 extension XCTestCase {
     func wycheproofTest<T: Codable>(jsonName: String, file: StaticString = #file, line: UInt = #line, testFunction: (T) throws -> Void) throws {
         let testsDirectory: String = URL(fileURLWithPath: "\(#file)").pathComponents.dropLast(3).joined(separator: "/")
-        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/_CryptoExtrasVectors/\(jsonName).json")
+        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/CryptoExtrasVectors/\(jsonName).json")
 
         let data = try Data(contentsOf: fileURL!)
 
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128GFSbox128.txt b/Tests/CryptoExtrasVectors/AESCFB128GFSbox128.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128GFSbox128.txt
rename to Tests/CryptoExtrasVectors/AESCFB128GFSbox128.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128GFSbox192.txt b/Tests/CryptoExtrasVectors/AESCFB128GFSbox192.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128GFSbox192.txt
rename to Tests/CryptoExtrasVectors/AESCFB128GFSbox192.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128GFSbox256.txt b/Tests/CryptoExtrasVectors/AESCFB128GFSbox256.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128GFSbox256.txt
rename to Tests/CryptoExtrasVectors/AESCFB128GFSbox256.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128KeySbox128.txt b/Tests/CryptoExtrasVectors/AESCFB128KeySbox128.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128KeySbox128.txt
rename to Tests/CryptoExtrasVectors/AESCFB128KeySbox128.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128KeySbox192.txt b/Tests/CryptoExtrasVectors/AESCFB128KeySbox192.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128KeySbox192.txt
rename to Tests/CryptoExtrasVectors/AESCFB128KeySbox192.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128KeySbox256.txt b/Tests/CryptoExtrasVectors/AESCFB128KeySbox256.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128KeySbox256.txt
rename to Tests/CryptoExtrasVectors/AESCFB128KeySbox256.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarKey128.txt b/Tests/CryptoExtrasVectors/AESCFB128VarKey128.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarKey128.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarKey128.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarKey192.txt b/Tests/CryptoExtrasVectors/AESCFB128VarKey192.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarKey192.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarKey192.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarKey256.txt b/Tests/CryptoExtrasVectors/AESCFB128VarKey256.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarKey256.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarKey256.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarTxt128.txt b/Tests/CryptoExtrasVectors/AESCFB128VarTxt128.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarTxt128.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarTxt128.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarTxt192.txt b/Tests/CryptoExtrasVectors/AESCFB128VarTxt192.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarTxt192.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarTxt192.txt
diff --git a/Tests/_CryptoExtrasVectors/AESCFB128VarTxt256.txt b/Tests/CryptoExtrasVectors/AESCFB128VarTxt256.txt
similarity index 100%
rename from Tests/_CryptoExtrasVectors/AESCFB128VarTxt256.txt
rename to Tests/CryptoExtrasVectors/AESCFB128VarTxt256.txt
diff --git a/Tests/_CryptoExtrasVectors/aes_cbc_pkcs5_test.json b/Tests/CryptoExtrasVectors/aes_cbc_pkcs5_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/aes_cbc_pkcs5_test.json
rename to Tests/CryptoExtrasVectors/aes_cbc_pkcs5_test.json
diff --git a/Tests/_CryptoExtrasVectors/aes_gcm_siv_test.json b/Tests/CryptoExtrasVectors/aes_gcm_siv_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/aes_gcm_siv_test.json
rename to Tests/CryptoExtrasVectors/aes_gcm_siv_test.json
diff --git a/Tests/_CryptoExtrasVectors/rfc9474.json b/Tests/CryptoExtrasVectors/rfc9474.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rfc9474.json
rename to Tests/CryptoExtrasVectors/rfc9474.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_oaep_2048_sha1_mgf1sha1_test.json b/Tests/CryptoExtrasVectors/rsa_oaep_2048_sha1_mgf1sha1_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_oaep_2048_sha1_mgf1sha1_test.json
rename to Tests/CryptoExtrasVectors/rsa_oaep_2048_sha1_mgf1sha1_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_oaep_2048_sha256_mgf1sha256_test.json b/Tests/CryptoExtrasVectors/rsa_oaep_2048_sha256_mgf1sha256_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_oaep_2048_sha256_mgf1sha256_test.json
rename to Tests/CryptoExtrasVectors/rsa_oaep_2048_sha256_mgf1sha256_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_oaep_misc_test.json b/Tests/CryptoExtrasVectors/rsa_oaep_misc_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_oaep_misc_test.json
rename to Tests/CryptoExtrasVectors/rsa_oaep_misc_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_2048_sha1_mgf1_20_test.json b/Tests/CryptoExtrasVectors/rsa_pss_2048_sha1_mgf1_20_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_2048_sha1_mgf1_20_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_2048_sha1_mgf1_20_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_0_test.json b/Tests/CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_0_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_0_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_0_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_32_test.json b/Tests/CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_32_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_32_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_2048_sha256_mgf1_32_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_3072_sha256_mgf1_32_test.json b/Tests/CryptoExtrasVectors/rsa_pss_3072_sha256_mgf1_32_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_3072_sha256_mgf1_32_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_3072_sha256_mgf1_32_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_4096_sha256_mgf1_32_test.json b/Tests/CryptoExtrasVectors/rsa_pss_4096_sha256_mgf1_32_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_4096_sha256_mgf1_32_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_4096_sha256_mgf1_32_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_4096_sha512_mgf1_32_test.json b/Tests/CryptoExtrasVectors/rsa_pss_4096_sha512_mgf1_32_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_4096_sha512_mgf1_32_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_4096_sha512_mgf1_32_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_pss_misc_test.json b/Tests/CryptoExtrasVectors/rsa_pss_misc_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_pss_misc_test.json
rename to Tests/CryptoExtrasVectors/rsa_pss_misc_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_2048_sha256_test.json b/Tests/CryptoExtrasVectors/rsa_signature_2048_sha256_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_2048_sha256_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_2048_sha256_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_2048_sha512_test.json b/Tests/CryptoExtrasVectors/rsa_signature_2048_sha512_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_2048_sha512_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_2048_sha512_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_3072_sha256_test.json b/Tests/CryptoExtrasVectors/rsa_signature_3072_sha256_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_3072_sha256_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_3072_sha256_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_3072_sha512_test.json b/Tests/CryptoExtrasVectors/rsa_signature_3072_sha512_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_3072_sha512_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_3072_sha512_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_4096_sha512_test.json b/Tests/CryptoExtrasVectors/rsa_signature_4096_sha512_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_4096_sha512_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_4096_sha512_test.json
diff --git a/Tests/_CryptoExtrasVectors/rsa_signature_test.json b/Tests/CryptoExtrasVectors/rsa_signature_test.json
similarity index 100%
rename from Tests/_CryptoExtrasVectors/rsa_signature_test.json
rename to Tests/CryptoExtrasVectors/rsa_signature_test.json
diff --git a/scripts/update-cmake-lists.sh b/scripts/update-cmake-lists.sh
index 46057567..ec4f619a 100755
--- a/scripts/update-cmake-lists.sh
+++ b/scripts/update-cmake-lists.sh
@@ -93,6 +93,6 @@ update_cmakelists_source "CCryptoBoringSSL"
 update_cmakelists_source "CCryptoBoringSSLShims"
 update_cmakelists_source "CryptoBoringWrapper"
 update_cmakelists_source "Crypto"
-update_cmakelists_source "_CryptoExtras" "*/AES/*.swift"
+update_cmakelists_source "CryptoExtras" "*/AES/*.swift"
 
 update_cmakelists_assembly "CCryptoBoringSSL"