diff --git a/Package.swift b/Package.swift
index f751bfbe..12733999 100644
--- a/Package.swift
+++ b/Package.swift
@@ -50,6 +50,7 @@ default:
 }
 
 var sharedSwiftSettings: [SwiftSetting] = [
+    .enableUpcomingFeature("InternalImportsByDefault"),
     .define("OPENGRAPH_RELEASE_\(releaseVersion)"),
     .swiftLanguageMode(.v5),
 ]
@@ -103,14 +104,7 @@ let includePath = SDKPath.appending("/usr/lib/swift")
 
 let package = Package(
     name: "OpenGraph",
-    platforms: [
-        .iOS(.v15),
-        .macOS(.v12),
-        .macCatalyst(.v15),
-        .tvOS(.v15),
-        .watchOS(.v8),
-        .visionOS(.v1),
-    ],
+    platforms: platforms,
     products: [
         .library(name: "OpenGraphShims", targets: ["OpenGraphShims"]),
         .library(name: "OpenGraph", targets: ["OpenGraph"]),
@@ -123,7 +117,7 @@ let package = Package(
         // OpenGraph is a C++ & Swift mix target.
         // The SwiftPM support for such usage is still in progress.
         .target(
-            name: "_OpenGraph",
+            name: "OpenGraph_SPI",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
@@ -135,7 +129,7 @@ let package = Package(
         ),
         .target(
             name: "OpenGraph",
-            dependencies: ["_OpenGraph"],
+            dependencies: ["OpenGraph_SPI"],
             swiftSettings: sharedSwiftSettings
         ),
         .plugin(
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
index 2701a026..e2d7a03a 100644
--- a/Package@swift-5.10.swift
+++ b/Package@swift-5.10.swift
@@ -20,7 +20,19 @@ func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
 let isXcodeEnv = Context.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode"
 let development = envEnable("OPENGRAPH_DEVELOPMENT", default: false)
 
-var sharedSwiftSettings: [SwiftSetting] = []
+let releaseVersion = Context.environment["OPENGRAPH_TARGET_RELEASE"].flatMap { Int($0) } ?? 2021
+
+var sharedSwiftSettings: [SwiftSetting] = [
+    .enableExperimentalFeature("AccessLevelOnImport"),
+    .enableUpcomingFeature("InternalImportsByDefault"),
+    .define("OPENGRAPH_RELEASE_\(releaseVersion)"),
+]
+
+if releaseVersion >= 2021 {
+    for year in 2021 ... releaseVersion {
+        sharedSwiftSettings.append(.define("OPENGRAPH_SUPPORT_\(year)_API"))
+    }
+}
 
 let warningsAsErrorsCondition = envEnable("OPENGRAPH_WERROR", default: isXcodeEnv && development)
 if warningsAsErrorsCondition {
@@ -79,7 +91,7 @@ let package = Package(
         // OpenGraph is a C++ & Swift mix target.
         // The SwiftPM support for such usage is still in progress.
         .target(
-            name: "_OpenGraph",
+            name: "OpenGraph_SPI",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
@@ -91,7 +103,7 @@ let package = Package(
         ),
         .target(
             name: "OpenGraph",
-            dependencies: ["_OpenGraph"],
+            dependencies: ["OpenGraph_SPI"],
             swiftSettings: sharedSwiftSettings
         ),
         .plugin(
diff --git a/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift b/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift
index 52d230d7..e4a6dca9 100644
--- a/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift
+++ b/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: API complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 public typealias AnyAttribute = OGAttribute
 
diff --git a/Sources/OpenGraph/Attribute/Attribute/Attribute.swift b/Sources/OpenGraph/Attribute/Attribute/Attribute.swift
index da7a82a6..c4d0bf02 100644
--- a/Sources/OpenGraph/Attribute/Attribute/Attribute.swift
+++ b/Sources/OpenGraph/Attribute/Attribute/Attribute.swift
@@ -1,4 +1,4 @@
-import _OpenGraph
+public import OpenGraph_SPI
 
 @frozen
 @propertyWrapper
diff --git a/Sources/OpenGraph/Attribute/Body/AttributeBody.swift b/Sources/OpenGraph/Attribute/Body/AttributeBody.swift
index 7fab5476..18fc6a92 100644
--- a/Sources/OpenGraph/Attribute/Body/AttributeBody.swift
+++ b/Sources/OpenGraph/Attribute/Body/AttributeBody.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 public protocol _AttributeBody {
     static func _destroySelf(_ pointer: UnsafeMutableRawPointer)
diff --git a/Sources/OpenGraph/Attribute/Rule/AnyRuleContext.swift b/Sources/OpenGraph/Attribute/Rule/AnyRuleContext.swift
index 643b7411..28063401 100644
--- a/Sources/OpenGraph/Attribute/Rule/AnyRuleContext.swift
+++ b/Sources/OpenGraph/Attribute/Rule/AnyRuleContext.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 @frozen
 public struct AnyRuleContext {
diff --git a/Sources/OpenGraph/Attribute/Rule/Rule.swift b/Sources/OpenGraph/Attribute/Rule/Rule.swift
index 54e73e0f..9530d4ed 100644
--- a/Sources/OpenGraph/Attribute/Rule/Rule.swift
+++ b/Sources/OpenGraph/Attribute/Rule/Rule.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 public protocol Rule: _AttributeBody {
     associatedtype Value
diff --git a/Sources/OpenGraph/Attribute/Rule/RuleContext.swift b/Sources/OpenGraph/Attribute/Rule/RuleContext.swift
index 1c86229b..3c37dac1 100644
--- a/Sources/OpenGraph/Attribute/Rule/RuleContext.swift
+++ b/Sources/OpenGraph/Attribute/Rule/RuleContext.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 @frozen
 public struct RuleContext<Value> {
diff --git a/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift b/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift
index c6e2361a..e44ddedb 100644
--- a/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift
+++ b/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 public protocol StatefulRule: _AttributeBody {
     associatedtype Value
diff --git a/Sources/OpenGraph/Attribute/Weak/AnyWeakAttribute.swift b/Sources/OpenGraph/Attribute/Weak/AnyWeakAttribute.swift
index c58d7e4e..a2849009 100644
--- a/Sources/OpenGraph/Attribute/Weak/AnyWeakAttribute.swift
+++ b/Sources/OpenGraph/Attribute/Weak/AnyWeakAttribute.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 public typealias AnyWeakAttribute = OGWeakAttribute
 
diff --git a/Sources/OpenGraph/Attribute/Weak/WeakAttribute.swift b/Sources/OpenGraph/Attribute/Weak/WeakAttribute.swift
index e08fdaa4..3e918d1c 100644
--- a/Sources/OpenGraph/Attribute/Weak/WeakAttribute.swift
+++ b/Sources/OpenGraph/Attribute/Weak/WeakAttribute.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 @frozen
 @propertyWrapper
diff --git a/Sources/OpenGraph/Export.swift b/Sources/OpenGraph/Export.swift
index 2749f66c..59b6a311 100644
--- a/Sources/OpenGraph/Export.swift
+++ b/Sources/OpenGraph/Export.swift
@@ -1 +1 @@
-@_exported import _OpenGraph
+@_exported public import OpenGraph_SPI
diff --git a/Sources/OpenGraph/Graph/OGGraph.swift b/Sources/OpenGraph/Graph/OGGraph.swift
index c7b8d21e..24fc0125 100644
--- a/Sources/OpenGraph/Graph/OGGraph.swift
+++ b/Sources/OpenGraph/Graph/OGGraph.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: WIP
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 extension OGGraph {
     public static func typeIndex(
diff --git a/Sources/OpenGraph/Graph/OGSubgraph.swift b/Sources/OpenGraph/Graph/OGSubgraph.swift
index 0d04315b..c6284ba4 100644
--- a/Sources/OpenGraph/Graph/OGSubgraph.swift
+++ b/Sources/OpenGraph/Graph/OGSubgraph.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: WIP
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 extension OGSubgraph {
     public func addObserver(_ observer: () -> Void) -> Int {
diff --git a/Sources/OpenGraph/Runtime/CompareValues.swift b/Sources/OpenGraph/Runtime/CompareValues.swift
index e2e89ce6..4aba95a1 100644
--- a/Sources/OpenGraph/Runtime/CompareValues.swift
+++ b/Sources/OpenGraph/Runtime/CompareValues.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 @_silgen_name("OGCompareValues")
 private func OGCompareValues(
diff --git a/Sources/OpenGraph/Runtime/OGTupleType.swift b/Sources/OpenGraph/Runtime/OGTupleType.swift
index c8ebf32d..8116d340 100644
--- a/Sources/OpenGraph/Runtime/OGTupleType.swift
+++ b/Sources/OpenGraph/Runtime/OGTupleType.swift
@@ -4,7 +4,7 @@
 //
 //
 
-import _OpenGraph
+public import OpenGraph_SPI
 
 @_silgen_name("OGTupleElementType")
 @inline(__always)
diff --git a/Sources/OpenGraph/Runtime/OGTypeApplyEnumData.swift b/Sources/OpenGraph/Runtime/OGTypeApplyEnumData.swift
index 88fa4523..bb232190 100644
--- a/Sources/OpenGraph/Runtime/OGTypeApplyEnumData.swift
+++ b/Sources/OpenGraph/Runtime/OGTypeApplyEnumData.swift
@@ -4,7 +4,7 @@
 //
 //
 
-import _OpenGraph
+// public import OpenGraph_SPI
 
 @discardableResult
 public func withUnsafePointerToEnumCase<T>(
diff --git a/Sources/OpenGraph/Runtime/OGTypeID.swift b/Sources/OpenGraph/Runtime/OGTypeID.swift
index f43c0d58..af6621e9 100644
--- a/Sources/OpenGraph/Runtime/OGTypeID.swift
+++ b/Sources/OpenGraph/Runtime/OGTypeID.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: WIP
 
-import _OpenGraph
+public import OpenGraph_SPI
 #if canImport(ObjectiveC)
 import Foundation
 #endif
diff --git a/Sources/OpenGraphShims/GraphShims.swift b/Sources/OpenGraphShims/GraphShims.swift
index 887a24b2..a3f4bf46 100644
--- a/Sources/OpenGraphShims/GraphShims.swift
+++ b/Sources/OpenGraphShims/GraphShims.swift
@@ -2,7 +2,7 @@
 //  GraphShims.swift
 
 #if OPENGRAPH_ATTRIBUTEGRAPH
-@_exported import AttributeGraph
+@_exported public import AttributeGraph
 public typealias OGAttributeFlags = AGAttributeFlags
 public typealias OGAttributeInfo = AGAttributeInfo
 public typealias OGAttributeType = AGAttributeType
diff --git a/Sources/_OpenGraph/Attribute/AttributeID.cpp b/Sources/OpenGraph_SPI/Attribute/AttributeID.cpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/AttributeID.cpp
rename to Sources/OpenGraph_SPI/Attribute/AttributeID.cpp
diff --git a/Sources/_OpenGraph/Attribute/AttributeID.hpp b/Sources/OpenGraph_SPI/Attribute/AttributeID.hpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/AttributeID.hpp
rename to Sources/OpenGraph_SPI/Attribute/AttributeID.hpp
diff --git a/Sources/_OpenGraph/Attribute/AttributeType.cpp b/Sources/OpenGraph_SPI/Attribute/AttributeType.cpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/AttributeType.cpp
rename to Sources/OpenGraph_SPI/Attribute/AttributeType.cpp
diff --git a/Sources/_OpenGraph/Attribute/AttributeType.hpp b/Sources/OpenGraph_SPI/Attribute/AttributeType.hpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/AttributeType.hpp
rename to Sources/OpenGraph_SPI/Attribute/AttributeType.hpp
diff --git a/Sources/_OpenGraph/Attribute/OGAttribute.cpp b/Sources/OpenGraph_SPI/Attribute/OGAttribute.cpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttribute.cpp
rename to Sources/OpenGraph_SPI/Attribute/OGAttribute.cpp
diff --git a/Sources/_OpenGraph/Attribute/OGAttribute.h b/Sources/OpenGraph_SPI/Attribute/OGAttribute.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttribute.h
rename to Sources/OpenGraph_SPI/Attribute/OGAttribute.h
diff --git a/Sources/_OpenGraph/Attribute/OGAttributeFlags.h b/Sources/OpenGraph_SPI/Attribute/OGAttributeFlags.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttributeFlags.h
rename to Sources/OpenGraph_SPI/Attribute/OGAttributeFlags.h
diff --git a/Sources/_OpenGraph/Attribute/OGAttributeInfo.h b/Sources/OpenGraph_SPI/Attribute/OGAttributeInfo.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttributeInfo.h
rename to Sources/OpenGraph_SPI/Attribute/OGAttributeInfo.h
diff --git a/Sources/_OpenGraph/Attribute/OGAttributeType.h b/Sources/OpenGraph_SPI/Attribute/OGAttributeType.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttributeType.h
rename to Sources/OpenGraph_SPI/Attribute/OGAttributeType.h
diff --git a/Sources/_OpenGraph/Attribute/OGAttributeTypeFlags.h b/Sources/OpenGraph_SPI/Attribute/OGAttributeTypeFlags.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGAttributeTypeFlags.h
rename to Sources/OpenGraph_SPI/Attribute/OGAttributeTypeFlags.h
diff --git a/Sources/_OpenGraph/Attribute/OGCachedValueOptions.h b/Sources/OpenGraph_SPI/Attribute/OGCachedValueOptions.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGCachedValueOptions.h
rename to Sources/OpenGraph_SPI/Attribute/OGCachedValueOptions.h
diff --git a/Sources/_OpenGraph/Attribute/OGChangedValueFlags.h b/Sources/OpenGraph_SPI/Attribute/OGChangedValueFlags.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGChangedValueFlags.h
rename to Sources/OpenGraph_SPI/Attribute/OGChangedValueFlags.h
diff --git a/Sources/_OpenGraph/Attribute/OGInputOptions.h b/Sources/OpenGraph_SPI/Attribute/OGInputOptions.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGInputOptions.h
rename to Sources/OpenGraph_SPI/Attribute/OGInputOptions.h
diff --git a/Sources/_OpenGraph/Attribute/OGSearchOptions.h b/Sources/OpenGraph_SPI/Attribute/OGSearchOptions.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGSearchOptions.h
rename to Sources/OpenGraph_SPI/Attribute/OGSearchOptions.h
diff --git a/Sources/_OpenGraph/Attribute/OGValue.h b/Sources/OpenGraph_SPI/Attribute/OGValue.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGValue.h
rename to Sources/OpenGraph_SPI/Attribute/OGValue.h
diff --git a/Sources/_OpenGraph/Attribute/OGValueOptions.h b/Sources/OpenGraph_SPI/Attribute/OGValueOptions.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGValueOptions.h
rename to Sources/OpenGraph_SPI/Attribute/OGValueOptions.h
diff --git a/Sources/_OpenGraph/Attribute/OGValueState.h b/Sources/OpenGraph_SPI/Attribute/OGValueState.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGValueState.h
rename to Sources/OpenGraph_SPI/Attribute/OGValueState.h
diff --git a/Sources/_OpenGraph/Attribute/OGWeakAttribute.cpp b/Sources/OpenGraph_SPI/Attribute/OGWeakAttribute.cpp
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGWeakAttribute.cpp
rename to Sources/OpenGraph_SPI/Attribute/OGWeakAttribute.cpp
diff --git a/Sources/_OpenGraph/Attribute/OGWeakAttribute.h b/Sources/OpenGraph_SPI/Attribute/OGWeakAttribute.h
similarity index 100%
rename from Sources/_OpenGraph/Attribute/OGWeakAttribute.h
rename to Sources/OpenGraph_SPI/Attribute/OGWeakAttribute.h
diff --git a/Sources/_OpenGraph/Data/ClosureFunction.cpp b/Sources/OpenGraph_SPI/Data/ClosureFunction.cpp
similarity index 100%
rename from Sources/_OpenGraph/Data/ClosureFunction.cpp
rename to Sources/OpenGraph_SPI/Data/ClosureFunction.cpp
diff --git a/Sources/_OpenGraph/Data/ClosureFunction.hpp b/Sources/OpenGraph_SPI/Data/ClosureFunction.hpp
similarity index 100%
rename from Sources/_OpenGraph/Data/ClosureFunction.hpp
rename to Sources/OpenGraph_SPI/Data/ClosureFunction.hpp
diff --git a/Sources/_OpenGraph/Data/OGUniqueID.c b/Sources/OpenGraph_SPI/Data/OGUniqueID.c
similarity index 100%
rename from Sources/_OpenGraph/Data/OGUniqueID.c
rename to Sources/OpenGraph_SPI/Data/OGUniqueID.c
diff --git a/Sources/_OpenGraph/Data/OGUniqueID.h b/Sources/OpenGraph_SPI/Data/OGUniqueID.h
similarity index 100%
rename from Sources/_OpenGraph/Data/OGUniqueID.h
rename to Sources/OpenGraph_SPI/Data/OGUniqueID.h
diff --git a/Sources/_OpenGraph/Debug/OGDebugServer.cpp b/Sources/OpenGraph_SPI/Debug/OGDebugServer.cpp
similarity index 100%
rename from Sources/_OpenGraph/Debug/OGDebugServer.cpp
rename to Sources/OpenGraph_SPI/Debug/OGDebugServer.cpp
diff --git a/Sources/_OpenGraph/Debug/OGDebugServer.h b/Sources/OpenGraph_SPI/Debug/OGDebugServer.h
similarity index 100%
rename from Sources/_OpenGraph/Debug/OGDebugServer.h
rename to Sources/OpenGraph_SPI/Debug/OGDebugServer.h
diff --git a/Sources/_OpenGraph/Debug/og-debug-server.hpp b/Sources/OpenGraph_SPI/Debug/og-debug-server.hpp
similarity index 100%
rename from Sources/_OpenGraph/Debug/og-debug-server.hpp
rename to Sources/OpenGraph_SPI/Debug/og-debug-server.hpp
diff --git a/Sources/_OpenGraph/Debug/og-debug-server.mm b/Sources/OpenGraph_SPI/Debug/og-debug-server.mm
similarity index 100%
rename from Sources/_OpenGraph/Debug/og-debug-server.mm
rename to Sources/OpenGraph_SPI/Debug/og-debug-server.mm
diff --git a/Sources/_OpenGraph/Graph/Graph.cpp b/Sources/OpenGraph_SPI/Graph/Graph.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/Graph.cpp
rename to Sources/OpenGraph_SPI/Graph/Graph.cpp
diff --git a/Sources/_OpenGraph/Graph/Graph.hpp b/Sources/OpenGraph_SPI/Graph/Graph.hpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/Graph.hpp
rename to Sources/OpenGraph_SPI/Graph/Graph.hpp
diff --git a/Sources/_OpenGraph/Graph/GraphContext.cpp b/Sources/OpenGraph_SPI/Graph/GraphContext.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/GraphContext.cpp
rename to Sources/OpenGraph_SPI/Graph/GraphContext.cpp
diff --git a/Sources/_OpenGraph/Graph/GraphDescription.mm b/Sources/OpenGraph_SPI/Graph/GraphDescription.mm
similarity index 100%
rename from Sources/_OpenGraph/Graph/GraphDescription.mm
rename to Sources/OpenGraph_SPI/Graph/GraphDescription.mm
diff --git a/Sources/_OpenGraph/Graph/OGCounterQueryType.h b/Sources/OpenGraph_SPI/Graph/OGCounterQueryType.h
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGCounterQueryType.h
rename to Sources/OpenGraph_SPI/Graph/OGCounterQueryType.h
diff --git a/Sources/_OpenGraph/Graph/OGGraph.cpp b/Sources/OpenGraph_SPI/Graph/OGGraph.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGGraph.cpp
rename to Sources/OpenGraph_SPI/Graph/OGGraph.cpp
diff --git a/Sources/_OpenGraph/Graph/OGGraph.h b/Sources/OpenGraph_SPI/Graph/OGGraph.h
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGGraph.h
rename to Sources/OpenGraph_SPI/Graph/OGGraph.h
diff --git a/Sources/_OpenGraph/Graph/OGGraphContext.cpp b/Sources/OpenGraph_SPI/Graph/OGGraphContext.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGGraphContext.cpp
rename to Sources/OpenGraph_SPI/Graph/OGGraphContext.cpp
diff --git a/Sources/_OpenGraph/Graph/OGGraphContext.h b/Sources/OpenGraph_SPI/Graph/OGGraphContext.h
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGGraphContext.h
rename to Sources/OpenGraph_SPI/Graph/OGGraphContext.h
diff --git a/Sources/_OpenGraph/Graph/OGGraphDescription.h b/Sources/OpenGraph_SPI/Graph/OGGraphDescription.h
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGGraphDescription.h
rename to Sources/OpenGraph_SPI/Graph/OGGraphDescription.h
diff --git a/Sources/_OpenGraph/Graph/OGSubgraph.cpp b/Sources/OpenGraph_SPI/Graph/OGSubgraph.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGSubgraph.cpp
rename to Sources/OpenGraph_SPI/Graph/OGSubgraph.cpp
diff --git a/Sources/_OpenGraph/Graph/OGSubgraph.h b/Sources/OpenGraph_SPI/Graph/OGSubgraph.h
similarity index 100%
rename from Sources/_OpenGraph/Graph/OGSubgraph.h
rename to Sources/OpenGraph_SPI/Graph/OGSubgraph.h
diff --git a/Sources/_OpenGraph/Graph/Subgraph.cpp b/Sources/OpenGraph_SPI/Graph/Subgraph.cpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/Subgraph.cpp
rename to Sources/OpenGraph_SPI/Graph/Subgraph.cpp
diff --git a/Sources/_OpenGraph/Graph/Subgraph.hpp b/Sources/OpenGraph_SPI/Graph/Subgraph.hpp
similarity index 100%
rename from Sources/_OpenGraph/Graph/Subgraph.hpp
rename to Sources/OpenGraph_SPI/Graph/Subgraph.hpp
diff --git a/Sources/_OpenGraph/OGBase.h b/Sources/OpenGraph_SPI/OGBase.h
similarity index 100%
rename from Sources/_OpenGraph/OGBase.h
rename to Sources/OpenGraph_SPI/OGBase.h
diff --git a/Sources/_OpenGraph/OGSwiftSupport.h b/Sources/OpenGraph_SPI/OGSwiftSupport.h
similarity index 100%
rename from Sources/_OpenGraph/OGSwiftSupport.h
rename to Sources/OpenGraph_SPI/OGSwiftSupport.h
diff --git a/Sources/_OpenGraph/OGTargetConditionals.h b/Sources/OpenGraph_SPI/OGTargetConditionals.h
similarity index 100%
rename from Sources/_OpenGraph/OGTargetConditionals.h
rename to Sources/OpenGraph_SPI/OGTargetConditionals.h
diff --git a/Sources/_OpenGraph/OGVersion.h b/Sources/OpenGraph_SPI/OGVersion.h
similarity index 100%
rename from Sources/_OpenGraph/OGVersion.h
rename to Sources/OpenGraph_SPI/OGVersion.h
diff --git a/Sources/_OpenGraph/Private/CFRuntime.h b/Sources/OpenGraph_SPI/Private/CFRuntime.h
similarity index 100%
rename from Sources/_OpenGraph/Private/CFRuntime.h
rename to Sources/OpenGraph_SPI/Private/CFRuntime.h
diff --git a/Sources/_OpenGraph/Runtime/OGCompareValues.cpp b/Sources/OpenGraph_SPI/Runtime/OGCompareValues.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGCompareValues.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGCompareValues.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGCompareValues.h b/Sources/OpenGraph_SPI/Runtime/OGCompareValues.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGCompareValues.h
rename to Sources/OpenGraph_SPI/Runtime/OGCompareValues.h
diff --git a/Sources/_OpenGraph/Runtime/OGComparisonMode.h b/Sources/OpenGraph_SPI/Runtime/OGComparisonMode.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGComparisonMode.h
rename to Sources/OpenGraph_SPI/Runtime/OGComparisonMode.h
diff --git a/Sources/_OpenGraph/Runtime/OGSwiftMetadata.h b/Sources/OpenGraph_SPI/Runtime/OGSwiftMetadata.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGSwiftMetadata.h
rename to Sources/OpenGraph_SPI/Runtime/OGSwiftMetadata.h
diff --git a/Sources/_OpenGraph/Runtime/OGTupleType.cpp b/Sources/OpenGraph_SPI/Runtime/OGTupleType.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTupleType.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGTupleType.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGTupleType.h b/Sources/OpenGraph_SPI/Runtime/OGTupleType.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTupleType.h
rename to Sources/OpenGraph_SPI/Runtime/OGTupleType.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeApplyEnumData.cpp b/Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeApplyEnumData.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGTypeApplyEnumData.h b/Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeApplyEnumData.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeApplyEnumData.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeApplyField.cpp b/Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeApplyField.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGTypeApplyField.h b/Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeApplyField.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeApplyField.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeApplyOptions.h b/Sources/OpenGraph_SPI/Runtime/OGTypeApplyOptions.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeApplyOptions.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeApplyOptions.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeDescription.cpp b/Sources/OpenGraph_SPI/Runtime/OGTypeDescription.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeDescription.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGTypeDescription.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGTypeDescription.h b/Sources/OpenGraph_SPI/Runtime/OGTypeDescription.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeDescription.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeDescription.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeID.cpp b/Sources/OpenGraph_SPI/Runtime/OGTypeID.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeID.cpp
rename to Sources/OpenGraph_SPI/Runtime/OGTypeID.cpp
diff --git a/Sources/_OpenGraph/Runtime/OGTypeID.h b/Sources/OpenGraph_SPI/Runtime/OGTypeID.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeID.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeID.h
diff --git a/Sources/_OpenGraph/Runtime/OGTypeKind.h b/Sources/OpenGraph_SPI/Runtime/OGTypeKind.h
similarity index 100%
rename from Sources/_OpenGraph/Runtime/OGTypeKind.h
rename to Sources/OpenGraph_SPI/Runtime/OGTypeKind.h
diff --git a/Sources/_OpenGraph/Runtime/metadata.cpp b/Sources/OpenGraph_SPI/Runtime/metadata.cpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/metadata.cpp
rename to Sources/OpenGraph_SPI/Runtime/metadata.cpp
diff --git a/Sources/_OpenGraph/Runtime/metadata.hpp b/Sources/OpenGraph_SPI/Runtime/metadata.hpp
similarity index 100%
rename from Sources/_OpenGraph/Runtime/metadata.hpp
rename to Sources/OpenGraph_SPI/Runtime/metadata.hpp
diff --git a/Sources/_OpenGraph/Util/assert.cpp b/Sources/OpenGraph_SPI/Util/assert.cpp
similarity index 100%
rename from Sources/_OpenGraph/Util/assert.cpp
rename to Sources/OpenGraph_SPI/Util/assert.cpp
diff --git a/Sources/_OpenGraph/Util/assert.hpp b/Sources/OpenGraph_SPI/Util/assert.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/assert.hpp
rename to Sources/OpenGraph_SPI/Util/assert.hpp
diff --git a/Sources/_OpenGraph/Util/env.hpp b/Sources/OpenGraph_SPI/Util/env.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/env.hpp
rename to Sources/OpenGraph_SPI/Util/env.hpp
diff --git a/Sources/_OpenGraph/Util/log.cpp b/Sources/OpenGraph_SPI/Util/log.cpp
similarity index 100%
rename from Sources/_OpenGraph/Util/log.cpp
rename to Sources/OpenGraph_SPI/Util/log.cpp
diff --git a/Sources/_OpenGraph/Util/log.hpp b/Sources/OpenGraph_SPI/Util/log.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/log.hpp
rename to Sources/OpenGraph_SPI/Util/log.hpp
diff --git a/Sources/_OpenGraph/Util/realloc_vector.cpp b/Sources/OpenGraph_SPI/Util/realloc_vector.cpp
similarity index 100%
rename from Sources/_OpenGraph/Util/realloc_vector.cpp
rename to Sources/OpenGraph_SPI/Util/realloc_vector.cpp
diff --git a/Sources/_OpenGraph/Util/realloc_vector.hpp b/Sources/OpenGraph_SPI/Util/realloc_vector.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/realloc_vector.hpp
rename to Sources/OpenGraph_SPI/Util/realloc_vector.hpp
diff --git a/Sources/_OpenGraph/Util/vector.hpp b/Sources/OpenGraph_SPI/Util/vector.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/vector.hpp
rename to Sources/OpenGraph_SPI/Util/vector.hpp
diff --git a/Sources/_OpenGraph/Util/wrap_iter.hpp b/Sources/OpenGraph_SPI/Util/wrap_iter.hpp
similarity index 100%
rename from Sources/_OpenGraph/Util/wrap_iter.hpp
rename to Sources/OpenGraph_SPI/Util/wrap_iter.hpp
diff --git a/Sources/_OpenGraph/include/CFRuntime.h b/Sources/OpenGraph_SPI/include/CFRuntime.h
similarity index 100%
rename from Sources/_OpenGraph/include/CFRuntime.h
rename to Sources/OpenGraph_SPI/include/CFRuntime.h
diff --git a/Sources/_OpenGraph/include/OGAttribute.h b/Sources/OpenGraph_SPI/include/OGAttribute.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGAttribute.h
rename to Sources/OpenGraph_SPI/include/OGAttribute.h
diff --git a/Sources/_OpenGraph/include/OGAttributeFlags.h b/Sources/OpenGraph_SPI/include/OGAttributeFlags.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGAttributeFlags.h
rename to Sources/OpenGraph_SPI/include/OGAttributeFlags.h
diff --git a/Sources/_OpenGraph/include/OGAttributeInfo.h b/Sources/OpenGraph_SPI/include/OGAttributeInfo.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGAttributeInfo.h
rename to Sources/OpenGraph_SPI/include/OGAttributeInfo.h
diff --git a/Sources/_OpenGraph/include/OGAttributeType.h b/Sources/OpenGraph_SPI/include/OGAttributeType.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGAttributeType.h
rename to Sources/OpenGraph_SPI/include/OGAttributeType.h
diff --git a/Sources/_OpenGraph/include/OGAttributeTypeFlags.h b/Sources/OpenGraph_SPI/include/OGAttributeTypeFlags.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGAttributeTypeFlags.h
rename to Sources/OpenGraph_SPI/include/OGAttributeTypeFlags.h
diff --git a/Sources/_OpenGraph/include/OGBase.h b/Sources/OpenGraph_SPI/include/OGBase.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGBase.h
rename to Sources/OpenGraph_SPI/include/OGBase.h
diff --git a/Sources/_OpenGraph/include/OGCachedValueOptions.h b/Sources/OpenGraph_SPI/include/OGCachedValueOptions.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGCachedValueOptions.h
rename to Sources/OpenGraph_SPI/include/OGCachedValueOptions.h
diff --git a/Sources/_OpenGraph/include/OGChangedValueFlags.h b/Sources/OpenGraph_SPI/include/OGChangedValueFlags.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGChangedValueFlags.h
rename to Sources/OpenGraph_SPI/include/OGChangedValueFlags.h
diff --git a/Sources/_OpenGraph/include/OGCompareValues.h b/Sources/OpenGraph_SPI/include/OGCompareValues.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGCompareValues.h
rename to Sources/OpenGraph_SPI/include/OGCompareValues.h
diff --git a/Sources/_OpenGraph/include/OGComparisonMode.h b/Sources/OpenGraph_SPI/include/OGComparisonMode.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGComparisonMode.h
rename to Sources/OpenGraph_SPI/include/OGComparisonMode.h
diff --git a/Sources/_OpenGraph/include/OGCounterQueryType.h b/Sources/OpenGraph_SPI/include/OGCounterQueryType.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGCounterQueryType.h
rename to Sources/OpenGraph_SPI/include/OGCounterQueryType.h
diff --git a/Sources/_OpenGraph/include/OGDebugServer.h b/Sources/OpenGraph_SPI/include/OGDebugServer.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGDebugServer.h
rename to Sources/OpenGraph_SPI/include/OGDebugServer.h
diff --git a/Sources/_OpenGraph/include/OGGraph.h b/Sources/OpenGraph_SPI/include/OGGraph.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGGraph.h
rename to Sources/OpenGraph_SPI/include/OGGraph.h
diff --git a/Sources/_OpenGraph/include/OGGraphContext.h b/Sources/OpenGraph_SPI/include/OGGraphContext.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGGraphContext.h
rename to Sources/OpenGraph_SPI/include/OGGraphContext.h
diff --git a/Sources/_OpenGraph/include/OGGraphDescription.h b/Sources/OpenGraph_SPI/include/OGGraphDescription.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGGraphDescription.h
rename to Sources/OpenGraph_SPI/include/OGGraphDescription.h
diff --git a/Sources/_OpenGraph/include/OGInputOptions.h b/Sources/OpenGraph_SPI/include/OGInputOptions.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGInputOptions.h
rename to Sources/OpenGraph_SPI/include/OGInputOptions.h
diff --git a/Sources/_OpenGraph/include/OGSearchOptions.h b/Sources/OpenGraph_SPI/include/OGSearchOptions.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGSearchOptions.h
rename to Sources/OpenGraph_SPI/include/OGSearchOptions.h
diff --git a/Sources/_OpenGraph/include/OGSubgraph.h b/Sources/OpenGraph_SPI/include/OGSubgraph.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGSubgraph.h
rename to Sources/OpenGraph_SPI/include/OGSubgraph.h
diff --git a/Sources/_OpenGraph/include/OGSwiftMetadata.h b/Sources/OpenGraph_SPI/include/OGSwiftMetadata.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGSwiftMetadata.h
rename to Sources/OpenGraph_SPI/include/OGSwiftMetadata.h
diff --git a/Sources/_OpenGraph/include/OGSwiftSupport.h b/Sources/OpenGraph_SPI/include/OGSwiftSupport.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGSwiftSupport.h
rename to Sources/OpenGraph_SPI/include/OGSwiftSupport.h
diff --git a/Sources/_OpenGraph/include/OGTargetConditionals.h b/Sources/OpenGraph_SPI/include/OGTargetConditionals.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTargetConditionals.h
rename to Sources/OpenGraph_SPI/include/OGTargetConditionals.h
diff --git a/Sources/_OpenGraph/include/OGTupleType.h b/Sources/OpenGraph_SPI/include/OGTupleType.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTupleType.h
rename to Sources/OpenGraph_SPI/include/OGTupleType.h
diff --git a/Sources/_OpenGraph/include/OGTypeApplyEnumData.h b/Sources/OpenGraph_SPI/include/OGTypeApplyEnumData.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeApplyEnumData.h
rename to Sources/OpenGraph_SPI/include/OGTypeApplyEnumData.h
diff --git a/Sources/_OpenGraph/include/OGTypeApplyField.h b/Sources/OpenGraph_SPI/include/OGTypeApplyField.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeApplyField.h
rename to Sources/OpenGraph_SPI/include/OGTypeApplyField.h
diff --git a/Sources/_OpenGraph/include/OGTypeApplyOptions.h b/Sources/OpenGraph_SPI/include/OGTypeApplyOptions.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeApplyOptions.h
rename to Sources/OpenGraph_SPI/include/OGTypeApplyOptions.h
diff --git a/Sources/_OpenGraph/include/OGTypeDescription.h b/Sources/OpenGraph_SPI/include/OGTypeDescription.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeDescription.h
rename to Sources/OpenGraph_SPI/include/OGTypeDescription.h
diff --git a/Sources/_OpenGraph/include/OGTypeID.h b/Sources/OpenGraph_SPI/include/OGTypeID.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeID.h
rename to Sources/OpenGraph_SPI/include/OGTypeID.h
diff --git a/Sources/_OpenGraph/include/OGTypeKind.h b/Sources/OpenGraph_SPI/include/OGTypeKind.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGTypeKind.h
rename to Sources/OpenGraph_SPI/include/OGTypeKind.h
diff --git a/Sources/_OpenGraph/include/OGUniqueID.h b/Sources/OpenGraph_SPI/include/OGUniqueID.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGUniqueID.h
rename to Sources/OpenGraph_SPI/include/OGUniqueID.h
diff --git a/Sources/_OpenGraph/include/OGValue.h b/Sources/OpenGraph_SPI/include/OGValue.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGValue.h
rename to Sources/OpenGraph_SPI/include/OGValue.h
diff --git a/Sources/_OpenGraph/include/OGValueOptions.h b/Sources/OpenGraph_SPI/include/OGValueOptions.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGValueOptions.h
rename to Sources/OpenGraph_SPI/include/OGValueOptions.h
diff --git a/Sources/_OpenGraph/include/OGValueState.h b/Sources/OpenGraph_SPI/include/OGValueState.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGValueState.h
rename to Sources/OpenGraph_SPI/include/OGValueState.h
diff --git a/Sources/_OpenGraph/include/OGVersion.h b/Sources/OpenGraph_SPI/include/OGVersion.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGVersion.h
rename to Sources/OpenGraph_SPI/include/OGVersion.h
diff --git a/Sources/_OpenGraph/include/OGWeakAttribute.h b/Sources/OpenGraph_SPI/include/OGWeakAttribute.h
similarity index 100%
rename from Sources/_OpenGraph/include/OGWeakAttribute.h
rename to Sources/OpenGraph_SPI/include/OGWeakAttribute.h
diff --git a/Sources/_OpenGraph/include/OpenGraph-umbrella.h b/Sources/OpenGraph_SPI/include/OpenGraph-umbrella.h
similarity index 100%
rename from Sources/_OpenGraph/include/OpenGraph-umbrella.h
rename to Sources/OpenGraph_SPI/include/OpenGraph-umbrella.h
diff --git a/Tests/OpenGraphCompatibilityTests/GraphShims.swift b/Tests/OpenGraphCompatibilityTests/GraphShims.swift
index 2cdf5fd7..d59b1ce0 100644
--- a/Tests/OpenGraphCompatibilityTests/GraphShims.swift
+++ b/Tests/OpenGraphCompatibilityTests/GraphShims.swift
@@ -5,7 +5,7 @@
 //
 
 #if OPENGRAPH_COMPATIBILITY_TEST
-@_exported import AttributeGraph
+@_exported public import AttributeGraph
 public typealias OGAttributeFlags = AGAttributeFlags
 public typealias OGAttributeInfo = AGAttributeInfo
 public typealias OGAttributeType = AGAttributeType