From 5c95566f675488030b6378dfc983b990ff7fe3c9 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:39:08 +0200
Subject: [PATCH 1/2] Revert "Emit warning about renamed NuGet package on
 build"

This reverts commit f3eb3831f71db9a926012786d142cfaf5d2dc863.
---
 .../Build/JsonApiDotNetCore.OpenApi.targets                 | 6 ------
 .../JsonApiDotNetCore.OpenApi.csproj                        | 1 -
 2 files changed, 7 deletions(-)
 delete mode 100644 src/JsonApiDotNetCore.OpenApi/Build/JsonApiDotNetCore.OpenApi.targets

diff --git a/src/JsonApiDotNetCore.OpenApi/Build/JsonApiDotNetCore.OpenApi.targets b/src/JsonApiDotNetCore.OpenApi/Build/JsonApiDotNetCore.OpenApi.targets
deleted file mode 100644
index 6df9b10c1d..0000000000
--- a/src/JsonApiDotNetCore.OpenApi/Build/JsonApiDotNetCore.OpenApi.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="WarnAboutObsoletePackage" BeforeTargets="BeforeBuild">
-    <!-- Add <NoWarn>$(NoWarn);JADNC-OA</NoWarn> in a PropertyGroup in your project file to suppress this warning. -->
-    <Warning Code="JADNC-OA" Text="The 'JsonApiDotNetCore.OpenApi' package has been renamed, please use 'JsonApiDotNetCore.OpenApi.Swashbuckle' instead." />
-  </Target>
-</Project>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj b/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
index 68c4279c13..dd2c3d7d17 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
@@ -27,7 +27,6 @@
   <ItemGroup>
     <None Include="..\..\package-icon.png" Visible="false" Pack="True" PackagePath="" />
     <None Include="..\..\PackageReadme.md" Visible="false" Pack="True" PackagePath="" />
-    <None Include="Build\*.targets" Pack="True" PackagePath="build" />
   </ItemGroup>
 
   <ItemGroup>

From a4ea7a8530b3d4be528805d9d770153b806807a1 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sun, 14 Jul 2024 16:10:10 +0200
Subject: [PATCH 2/2] Rename JsonApiDotNetCore.OpenApi NuGet package to
 JsonApiDotNetCore.OpenApi.Swashbuckle, rename AddOpenApi() to
 AddOpenApiForJsonApi()

---
 JsonApiDotNetCore.sln                            |  2 +-
 docs/usage/openapi.md                            |  8 ++++----
 .../JsonApiDotNetCoreExample.csproj              |  2 +-
 src/Examples/JsonApiDotNetCoreExample/Program.cs |  6 +++---
 .../Properties/AssemblyInfo.cs                   |  2 +-
 .../ActionDescriptorExtensions.cs                |  2 +-
 .../ConfigureMvcOptions.cs                       |  2 +-
 .../ConfigureSwaggerGenOptions.cs                |  8 ++++----
 .../IncludeDependencyScanner.cs                  |  2 +-
 .../JsonApiActionDescriptorCollectionProvider.cs |  6 +++---
 ...JsonApiDotNetCore.OpenApi.Swashbuckle.csproj} |  0
 .../JsonApiEndpoint.cs                           |  2 +-
 .../AtomicOperationsRequestMetadata.cs           |  2 +-
 .../AtomicOperationsResponseMetadata.cs          |  2 +-
 .../JsonApiMetadata/EndpointResolver.cs          |  2 +-
 .../JsonApiMetadata/IJsonApiEndpointMetadata.cs  |  3 +++
 .../JsonApiMetadata/IJsonApiRequestMetadata.cs   |  2 +-
 .../JsonApiMetadata/IJsonApiResponseMetadata.cs  |  2 +-
 .../JsonApiEndpointMetadataContainer.cs          |  2 +-
 .../JsonApiEndpointMetadataProvider.cs           |  4 ++--
 .../NonPrimaryDocumentTypeFactory.cs             |  6 +++---
 .../NonPrimaryEndpointMetadata.cs                |  2 +-
 .../JsonApiMetadata/PrimaryRequestMetadata.cs    |  2 +-
 .../JsonApiMetadata/PrimaryResponseMetadata.cs   |  2 +-
 .../RelationshipRequestMetadata.cs               |  2 +-
 .../RelationshipResponseMetadata.cs              |  2 +-
 .../JsonApiMetadata/RelationshipTypeFactory.cs   |  4 ++--
 .../JsonApiMetadata/SecondaryResponseMetadata.cs |  2 +-
 .../AddToRelationshipOperation.cs                |  4 ++--
 .../AtomicOperations/AtomicOperation.cs          |  2 +-
 .../AtomicOperations/AtomicResult.cs             |  4 ++--
 .../AtomicOperations/CreateResourceOperation.cs  |  4 ++--
 .../AtomicOperations/DeleteResourceOperation.cs  |  4 ++--
 .../RemoveFromRelationshipOperation.cs           |  4 ++--
 .../AtomicOperations/UpdateResourceOperation.cs  |  4 ++--
 .../UpdateToManyRelationshipOperation.cs         |  4 ++--
 .../UpdateToOneRelationshipOperation.cs          |  4 ++--
 .../Documents/CreateResourceRequestDocument.cs   |  4 ++--
 .../Documents/ErrorResponseDocument.cs           |  4 ++--
 ...NullableResourceIdentifierResponseDocument.cs |  6 +++---
 .../NullableSecondaryResourceResponseDocument.cs |  6 +++---
 .../Documents/OperationsRequestDocument.cs       |  4 ++--
 .../Documents/OperationsResponseDocument.cs      |  6 +++---
 .../Documents/PrimaryResourceResponseDocument.cs |  6 +++---
 .../ResourceCollectionResponseDocument.cs        |  6 +++---
 ...sourceIdentifierCollectionResponseDocument.cs |  6 +++---
 .../ResourceIdentifierResponseDocument.cs        |  6 +++---
 .../SecondaryResourceResponseDocument.cs         |  6 +++---
 .../Documents/UpdateResourceRequestDocument.cs   |  4 ++--
 .../JsonApiObjects/Jsonapi.cs                    |  2 +-
 .../JsonApiObjects/Links/ErrorTopLevelLinks.cs   |  2 +-
 .../JsonApiObjects/Links/RelationshipLinks.cs    |  2 +-
 .../Links/ResourceCollectionTopLevelLinks.cs     |  2 +-
 .../ResourceIdentifierCollectionTopLevelLinks.cs |  2 +-
 .../Links/ResourceIdentifierTopLevelLinks.cs     |  2 +-
 .../JsonApiObjects/Links/ResourceLinks.cs        |  2 +-
 .../Links/ResourceTopLevelLinks.cs               |  2 +-
 .../JsonApiObjects/Meta.cs                       |  2 +-
 .../NullableToOneRelationshipInRequest.cs        |  4 ++--
 .../NullableToOneRelationshipInResponse.cs       |  6 +++---
 .../Relationships/ToManyRelationshipInRequest.cs |  4 ++--
 .../ToManyRelationshipInResponse.cs              |  6 +++---
 .../Relationships/ToOneRelationshipInRequest.cs  |  4 ++--
 .../Relationships/ToOneRelationshipInResponse.cs |  6 +++---
 .../AttributesInCreateResourceRequest.cs         |  2 +-
 .../ResourceObjects/AttributesInResponse.cs      |  2 +-
 .../AttributesInUpdateResourceRequest.cs         |  2 +-
 .../DataInCreateResourceRequest.cs               |  2 +-
 .../DataInUpdateResourceRequest.cs               |  2 +-
 .../ResourceObjects/IResourceIdentity.cs         |  2 +-
 .../ResourceObjects/RelationshipIdentifier.cs    |  2 +-
 .../RelationshipsInCreateResourceRequest.cs      |  2 +-
 .../ResourceObjects/RelationshipsInResponse.cs   |  2 +-
 .../RelationshipsInUpdateResourceRequest.cs      |  2 +-
 .../ResourceObjects/ResourceData.cs              |  2 +-
 .../ResourceObjects/ResourceDataInResponse.cs    |  4 ++--
 .../ResourceIdentifierInRequest.cs               |  2 +-
 .../ResourceIdentifierInResponse.cs              |  2 +-
 .../JsonApiPathParameter.cs                      |  2 +-
 .../JsonApiPropertyName.cs                       |  2 +-
 .../JsonApiRequestFormatMetadataProvider.cs      |  2 +-
 .../JsonApiRoutingTemplate.cs                    |  2 +-
 .../JsonApiSchemaFacts.cs                        |  6 +++---
 .../JsonApiSchemaIdSelector.cs                   | 10 +++++-----
 .../ObjectExtensions.cs                          |  2 +-
 .../OpenApiDescriptionLinkProvider.cs            |  2 +-
 .../OpenApiEndpointConvention.cs                 |  6 +++---
 .../OpenApiOperationIdSelector.cs                |  6 +++---
 .../OpenApiSchemaExtensions.cs                   |  2 +-
 .../ParameterInfoWrapper.cs                      |  2 +-
 .../ResourceFieldValidationMetadataProvider.cs   |  2 +-
 .../AtomicOperationsBodySchemaGenerator.cs       |  8 ++++----
 .../Bodies/BodySchemaGenerator.cs                |  4 ++--
 .../Bodies/ErrorResponseBodySchemaGenerator.cs   |  6 +++---
 .../ResourceOrRelationshipBodySchemaGenerator.cs | 10 +++++-----
 .../AbstractAtomicOperationSchemaGenerator.cs    |  4 ++--
 .../AbstractResourceDataSchemaGenerator.cs       |  6 +++---
 .../AtomicOperationCodeSchemaGenerator.cs        |  2 +-
 .../Components/DataContainerSchemaGenerator.cs   |  6 +++---
 .../Components/DataSchemaGenerator.cs            |  8 ++++----
 .../Components/LinksVisibilitySchemaGenerator.cs | 10 +++++-----
 .../Components/MetaSchemaGenerator.cs            |  4 ++--
 .../RelationshipIdentifierSchemaGenerator.cs     |  4 ++--
 .../RelationshipNameSchemaGenerator.cs           |  2 +-
 .../Components/ResourceIdSchemaGenerator.cs      |  2 +-
 .../ResourceIdentifierSchemaGenerator.cs         |  4 ++--
 .../Components/ResourceTypeSchemaGenerator.cs    |  2 +-
 .../GenerationCacheSchemaGenerator.cs            |  4 ++--
 .../SchemaGenerators/JsonApiSchemaGenerator.cs   |  6 +++---
 .../SchemaRepositoryExtensions.cs                |  2 +-
 .../ServiceCollectionExtensions.cs               | 16 ++++++++--------
 .../StringExtensions.cs                          |  2 +-
 .../DocumentationOpenApiOperationFilter.cs       |  2 +-
 .../SwaggerComponents/EndpointOrderingFilter.cs  |  2 +-
 .../JsonApiDataContractResolver.cs               |  2 +-
 .../ResourceDocumentationReader.cs               |  2 +-
 .../ResourceFieldSchemaBuilder.cs                |  8 ++++----
 .../SwaggerComponents/ResourceTypeInfo.cs        |  2 +-
 .../SwaggerComponents/ServerDocumentFilter.cs    |  2 +-
 .../TypeExtensions.cs                            |  2 +-
 .../UnreachableCodeException.cs                  |  2 +-
 .../UnusedComponentSchemaCleaner.cs              |  2 +-
 .../JsonApiMetadata/IJsonApiEndpointMetadata.cs  |  3 ---
 src/JsonApiDotNetCore/Properties/AssemblyInfo.cs |  2 +-
 test/OpenApiTests/OpenApiStartup.cs              |  4 ++--
 test/OpenApiTests/OpenApiTests.csproj            |  2 +-
 126 files changed, 227 insertions(+), 227 deletions(-)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ActionDescriptorExtensions.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ConfigureMvcOptions.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ConfigureSwaggerGenOptions.cs (94%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/IncludeDependencyScanner.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiActionDescriptorCollectionProvider.cs (98%)
 rename src/{JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj => JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj} (100%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiEndpoint.cs (83%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/AtomicOperationsRequestMetadata.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/AtomicOperationsResponseMetadata.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/EndpointResolver.cs (97%)
 create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/IJsonApiRequestMetadata.cs (52%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/IJsonApiResponseMetadata.cs (52%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs (86%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs (93%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/NonPrimaryEndpointMetadata.cs (85%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/PrimaryRequestMetadata.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/PrimaryResponseMetadata.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/RelationshipRequestMetadata.cs (75%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/RelationshipResponseMetadata.cs (75%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/RelationshipTypeFactory.cs (92%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiMetadata/SecondaryResponseMetadata.cs (75%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/AtomicOperation.cs (74%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/AtomicResult.cs (66%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs (76%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs (80%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/CreateResourceRequestDocument.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/ErrorResponseDocument.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs (78%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/OperationsRequestDocument.cs (74%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/OperationsResponseDocument.cs (74%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs (78%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs (79%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs (76%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs (78%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Jsonapi.cs (88%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ErrorTopLevelLinks.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/RelationshipLinks.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs (90%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs (91%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs (85%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ResourceLinks.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Links/ResourceTopLevelLinks.cs (82%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Meta.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs (75%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs (76%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs (73%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs (75%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs (70%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/AttributesInResponse.cs (68%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs (70%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs (90%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs (90%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/IResourceIdentity.cs (69%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs (84%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs (70%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs (68%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs (70%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/ResourceData.cs (81%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs (86%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs (88%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs (85%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiPathParameter.cs (77%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiPropertyName.cs (92%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiRequestFormatMetadataProvider.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiRoutingTemplate.cs (91%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiSchemaFacts.cs (90%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/JsonApiSchemaIdSelector.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ObjectExtensions.cs (91%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/OpenApiDescriptionLinkProvider.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/OpenApiEndpointConvention.cs (98%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/OpenApiOperationIdSelector.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/OpenApiSchemaExtensions.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ParameterInfoWrapper.cs (98%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ResourceFieldValidationMetadataProvider.cs (98%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Bodies/BodySchemaGenerator.cs (93%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs (88%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs (90%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs (93%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs (94%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/DataContainerSchemaGenerator.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/DataSchemaGenerator.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/MetaSchemaGenerator.cs (88%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs (94%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs (95%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs (94%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/GenerationCacheSchemaGenerator.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaGenerators/JsonApiSchemaGenerator.cs (92%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SchemaRepositoryExtensions.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/ServiceCollectionExtensions.cs (89%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/StringExtensions.cs (86%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/DocumentationOpenApiOperationFilter.cs (99%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/EndpointOrderingFilter.cs (96%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/JsonApiDataContractResolver.cs (98%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/ResourceDocumentationReader.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/ResourceFieldSchemaBuilder.cs (97%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/ResourceTypeInfo.cs (94%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/SwaggerComponents/ServerDocumentFilter.cs (93%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/TypeExtensions.cs (83%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/UnreachableCodeException.cs (67%)
 rename src/{JsonApiDotNetCore.OpenApi => JsonApiDotNetCore.OpenApi.Swashbuckle}/UnusedComponentSchemaCleaner.cs (97%)
 delete mode 100644 src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs

diff --git a/JsonApiDotNetCore.sln b/JsonApiDotNetCore.sln
index 3e092342c6..793c01950d 100644
--- a/JsonApiDotNetCore.sln
+++ b/JsonApiDotNetCore.sln
@@ -62,7 +62,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperExample", "src\Exampl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperTests", "test\DapperTests\DapperTests.csproj", "{80E322F5-5F5D-4670-A30F-02D33C2C7900}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi", "src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi.Swashbuckle", "src\JsonApiDotNetCore.OpenApi.Swashbuckle\JsonApiDotNetCore.OpenApi.Swashbuckle.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
 EndProject
diff --git a/docs/usage/openapi.md b/docs/usage/openapi.md
index 414a53bbb2..870caa2e97 100644
--- a/docs/usage/openapi.md
+++ b/docs/usage/openapi.md
@@ -4,15 +4,15 @@ Exposing an [OpenAPI document](https://swagger.io/specification/) for your JSON:
 [documentation website](https://swagger.io/tools/swagger-ui/) and to generate typed
 [client libraries](https://openapi-generator.tech/docs/generators/) in various languages.
 
-The [JsonApiDotNetCore.OpenApi](https://github.com/json-api-dotnet/JsonApiDotNetCore/pkgs/nuget/JsonApiDotNetCore.OpenApi) NuGet package
+The [JsonApiDotNetCore.OpenApi.Swashbuckle](https://github.com/json-api-dotnet/JsonApiDotNetCore/pkgs/nuget/JsonApiDotNetCore.OpenApi.Swashbuckle) NuGet package
 provides OpenAPI support for JSON:API by integrating with [Swashbuckle](https://github.com/domaindrivendev/Swashbuckle.AspNetCore).
 
 ## Getting started
 
-1.  Install the `JsonApiDotNetCore.OpenApi` NuGet package:
+1.  Install the `JsonApiDotNetCore.OpenApi.Swashbuckle` NuGet package:
 
     ```
-    dotnet add package JsonApiDotNetCore.OpenApi
+    dotnet add package JsonApiDotNetCore.OpenApi.Swashbuckle
     ```
 
     > [!NOTE]
@@ -25,7 +25,7 @@ provides OpenAPI support for JSON:API by integrating with [Swashbuckle](https://
     builder.Services.AddJsonApi<AppDbContext>();
 
     // Configure Swashbuckle for JSON:API.
-    builder.Services.AddOpenApi();
+    builder.Services.AddOpenApiForJsonApi();
 
     var app = builder.Build();
 
diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
index 654abe9a88..e55c2ae00d 100644
--- a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
+++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
     <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
       ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.OpenApi.Swashbuckle\JsonApiDotNetCore.OpenApi.Swashbuckle.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Examples/JsonApiDotNetCoreExample/Program.cs b/src/Examples/JsonApiDotNetCoreExample/Program.cs
index 925c2f02e3..3839fffe43 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Program.cs
@@ -3,7 +3,7 @@
 using System.Text.Json.Serialization;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
-using JsonApiDotNetCore.OpenApi;
+using JsonApiDotNetCore.OpenApi.Swashbuckle;
 using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Data;
 using Microsoft.EntityFrameworkCore;
@@ -83,9 +83,9 @@ static void ConfigureServices(WebApplicationBuilder builder)
         }, discovery => discovery.AddCurrentAssembly());
     }
 
-    using (CodeTimingSessionManager.Current.Measure("AddOpenApi()"))
+    using (CodeTimingSessionManager.Current.Measure("AddOpenApiForJsonApi()"))
     {
-        builder.Services.AddOpenApi(options => options.DocumentFilter<SetOpenApiServerAtBuildTimeFilter>());
+        builder.Services.AddOpenApiForJsonApi(options => options.DocumentFilter<SetOpenApiServerAtBuildTimeFilter>());
     }
 }
 
diff --git a/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs b/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs
index 21531c528d..b4ac4b1e8d 100644
--- a/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs
+++ b/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 [assembly: InternalsVisibleTo("DapperExample")]
 [assembly: InternalsVisibleTo("Benchmarks")]
 [assembly: InternalsVisibleTo("JsonApiDotNetCore")]
-[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi")]
+[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi.Swashbuckle")]
 [assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")]
 [assembly: InternalsVisibleTo("UnitTests")]
 [assembly: InternalsVisibleTo("TestBuildingBlocks")]
diff --git a/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs
index 0145751ab6..d796fba3dc 100644
--- a/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class ActionDescriptorExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/ConfigureMvcOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/ConfigureMvcOptions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
index 665432e6dd..b9e44aa7b5 100644
--- a/src/JsonApiDotNetCore.OpenApi/ConfigureMvcOptions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class ConfigureMvcOptions : IConfigureOptions<MvcOptions>
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/ConfigureSwaggerGenOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
similarity index 94%
rename from src/JsonApiDotNetCore.OpenApi/ConfigureSwaggerGenOptions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
index af3f51156c..d3ca6d14ad 100644
--- a/src/JsonApiDotNetCore.OpenApi/ConfigureSwaggerGenOptions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
@@ -1,15 +1,15 @@
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class ConfigureSwaggerGenOptions : IConfigureOptions<SwaggerGenOptions>
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/IncludeDependencyScanner.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/IncludeDependencyScanner.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs
index 4507268793..e1e21dbc13 100644
--- a/src/JsonApiDotNetCore.OpenApi/IncludeDependencyScanner.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/IncludeDependencyScanner.cs
@@ -1,7 +1,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class IncludeDependencyScanner
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
similarity index 98%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
index 8974cc8bf2..c91c64890f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Controllers;
@@ -10,7 +10,7 @@
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 /// <summary>
 /// Adds JsonApiDotNetCore metadata to <see cref="ControllerActionDescriptor" />s if available. This translates to updating response types in
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj
similarity index 100%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiEndpoint.cs
similarity index 83%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiEndpoint.cs
index 36bba414ed..570a97699b 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiEndpoint.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal enum JsonApiEndpoint
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
index 6cadf59f21..b9b0f44462 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class AtomicOperationsRequestMetadata : IJsonApiRequestMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
index b79f1f90fa..838055c378 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class AtomicOperationsResponseMetadata : IJsonApiResponseMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
index 10d95cd93c..fe5da000c9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class EndpointResolver
 {
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs
new file mode 100644
index 0000000000..01a8247ec5
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs
@@ -0,0 +1,3 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+
+internal interface IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs
similarity index 52%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs
index f51da515cc..86fbddebb6 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs
@@ -1,3 +1,3 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal interface IJsonApiRequestMetadata : IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs
similarity index 52%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs
index be6863a956..85fb69e856 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs
@@ -1,3 +1,3 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal interface IJsonApiResponseMetadata : IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
similarity index 86%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
index 9bc15bf89e..60b7182eb6 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 /// <summary>
 /// Metadata available at runtime about a JsonApiDotNetCore endpoint.
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
index 6b2138b889..471c490b2d 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
@@ -1,10 +1,10 @@
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 /// <summary>
 /// Provides JsonApiDotNetCore related metadata for an ASP.NET controller action that can only be computed from the <see cref="ResourceGraph" /> at
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs
similarity index 93%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs
index a8f1ce1d8d..9a297f2846 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryDocumentTypeFactory.cs
@@ -1,8 +1,8 @@
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class NonPrimaryDocumentTypeFactory
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
similarity index 85%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
index 72cb2c0c12..e1e284c0a8 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal abstract class NonPrimaryEndpointMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs
index f5784b0177..c66dc8546c 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class PrimaryRequestMetadata : IJsonApiRequestMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs
index 914191a0c1..514082154d 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class PrimaryResponseMetadata : IJsonApiResponseMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs
similarity index 75%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs
index c7d013de20..e2636da079 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
     : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiRequestMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs
similarity index 75%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs
index 16c1c5e005..7221dfbe5e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
     : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipTypeFactory.cs
similarity index 92%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipTypeFactory.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipTypeFactory.cs
index a51adfc67e..0040021cdb 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipTypeFactory.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipTypeFactory.cs
@@ -1,7 +1,7 @@
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class RelationshipTypeFactory
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs
similarity index 75%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs
index 08df61a8d1..39b8ce8d4f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 internal sealed class SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
     : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs
index 31524c4b54..0170916b52 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class AddToRelationshipOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicOperation.cs
similarity index 74%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicOperation.cs
index 70d7b12f18..eb42e73a11 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicOperation.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal abstract class AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicResult.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicResult.cs
similarity index 66%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicResult.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicResult.cs
index 8fddbcf071..ed910369a8 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/AtomicResult.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicResult.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class AtomicResult
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs
index 9eb19f86cb..a4e3f51e82 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/CreateResourceOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class CreateResourceOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs
similarity index 76%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs
index 43d081452a..d50cc5cf9f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/DeleteResourceOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class DeleteResourceOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs
index ca918fe435..b8dc0ed3e5 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class RemoveFromRelationshipOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs
index f59a401d3b..e515887b36 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateResourceOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class UpdateResourceOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs
similarity index 80%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs
index 06d5dfa20f..60cc6d7645 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class UpdateToManyRelationshipOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs
index 86b9bcbd1a..3ebb775df0 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class UpdateToOneRelationshipOperation<TResource> : AtomicOperation
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/CreateResourceRequestDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/CreateResourceRequestDocument.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/CreateResourceRequestDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/CreateResourceRequestDocument.cs
index 9823699e9e..13148eecd2 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/CreateResourceRequestDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/CreateResourceRequestDocument.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class CreateResourceRequestDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ErrorResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ErrorResponseDocument.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ErrorResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ErrorResponseDocument.cs
index 433c9db740..72f042fd46 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ErrorResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ErrorResponseDocument.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ErrorResponseDocument
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
index 2d1b3581b5..5e3e60b998 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 // Types in the JsonApiObjects namespace are never touched by ASP.NET ModelState validation, therefore using a non-nullable reference type for a property does not
 // imply this property is required. Instead, we use [Required] explicitly, because this is how Swashbuckle is instructed to mark properties as required.
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
similarity index 78%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
index 4a1df8fbf0..7b82a9c528 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class NullableSecondaryResourceResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsRequestDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsRequestDocument.cs
similarity index 74%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsRequestDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsRequestDocument.cs
index 9bb48f41be..dfafc6f124 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsRequestDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsRequestDocument.cs
@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class OperationsRequestDocument
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsResponseDocument.cs
similarity index 74%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsResponseDocument.cs
index 3cf3ab95e2..c9c9b5d8aa 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/OperationsResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/OperationsResponseDocument.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class OperationsResponseDocument
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
similarity index 78%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
index 58704de5f4..ecaaa19155 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class PrimaryResourceResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
similarity index 79%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
index 3a2c4d2369..e9165612c4 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceCollectionResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
index 3fe77115de..bfb73cf194 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceIdentifierCollectionResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
similarity index 76%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
index ee38e0742c..b238d17359 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceIdentifierResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
similarity index 78%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
index a0dc712fcd..2c02730c2a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class SecondaryResourceResponseDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs
index 755ba7a178..b4bc122b04 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Documents/UpdateResourceRequestDocument.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class UpdateResourceRequestDocument<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Jsonapi.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Jsonapi.cs
similarity index 88%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Jsonapi.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Jsonapi.cs
index 40ab7ad941..b51abdf402 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Jsonapi.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Jsonapi.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class Jsonapi
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ErrorTopLevelLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ErrorTopLevelLinks.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ErrorTopLevelLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ErrorTopLevelLinks.cs
index 9f708c23e7..f98c9eb480 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ErrorTopLevelLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ErrorTopLevelLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ErrorTopLevelLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/RelationshipLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/RelationshipLinks.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/RelationshipLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/RelationshipLinks.cs
index 899ce9f916..0bdae58dee 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/RelationshipLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/RelationshipLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class RelationshipLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs
similarity index 90%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs
index fd39b744e2..65710af45f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceCollectionTopLevelLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceCollectionTopLevelLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs
similarity index 91%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs
index c64350628a..8b9a3aaf55 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierCollectionTopLevelLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceIdentifierCollectionTopLevelLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs
similarity index 85%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs
index 86a0e31b5e..9af21cf6a1 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceIdentifierTopLevelLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceIdentifierTopLevelLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceLinks.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceLinks.cs
index 8a01483133..a37ef69523 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceTopLevelLinks.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceTopLevelLinks.cs
similarity index 82%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceTopLevelLinks.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceTopLevelLinks.cs
index f621961737..531c8d10ad 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/ResourceTopLevelLinks.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Links/ResourceTopLevelLinks.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceTopLevelLinks
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Meta.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Meta.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Meta.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Meta.cs
index 7f8c403156..a85cd3498a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Meta.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Meta.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class Meta
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
index c9162c429b..3064eda721 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class NullableToOneRelationshipInRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
similarity index 75%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
index 43c1b2f3e7..f39dee77b3 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class NullableToOneRelationshipInResponse<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
index f73119c742..c14af1ed0f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ToManyRelationshipInRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
similarity index 76%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
index 8c89dde95f..aeef460b87 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ToManyRelationshipInResponse<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
similarity index 73%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
index 3804b1998b..39efd01441 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ToOneRelationshipInRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
similarity index 75%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
index 9e9e554109..97be8b3c7a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ToOneRelationshipInResponse<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs
similarity index 70%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs
index 83ce260938..217fdd9674 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInCreateResourceRequest.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class AttributesInCreateResourceRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
similarity index 68%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
index 61b8dfc076..fc75dc17ea 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class AttributesInResponse<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs
similarity index 70%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs
index 82f39f8c07..9d038dff1e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/AttributesInUpdateResourceRequest.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class AttributesInUpdateResourceRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs
similarity index 90%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs
index 4835ab40cc..9ba282b3d2 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInCreateResourceRequest.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class DataInCreateResourceRequest<TResource> : ResourceData
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs
similarity index 90%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs
index e497d67673..b54d9342d9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/DataInUpdateResourceRequest.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class DataInUpdateResourceRequest<TResource> : ResourceData
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/IResourceIdentity.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/IResourceIdentity.cs
similarity index 69%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/IResourceIdentity.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/IResourceIdentity.cs
index 46ad6aae8c..e7ff17f037 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/IResourceIdentity.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/IResourceIdentity.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal interface IResourceIdentity
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs
similarity index 84%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs
index 5fef84a133..6ab945938f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipIdentifier.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class RelationshipIdentifier<TResource> : ResourceIdentifierInRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs
similarity index 70%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs
index 54808202ef..2ce3e95f83 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInCreateResourceRequest.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class RelationshipsInCreateResourceRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
similarity index 68%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
index f396d2c8ce..19d21b8352 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class RelationshipsInResponse<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs
similarity index 70%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs
index 7cc983a64f..866de7b049 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/RelationshipsInUpdateResourceRequest.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class RelationshipsInUpdateResourceRequest<TResource>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceData.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceData.cs
similarity index 81%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceData.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceData.cs
index 4294a9d629..3fac097f24 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceData.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceData.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal abstract class ResourceData : IResourceIdentity
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs
similarity index 86%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs
index ccfbb5c1f8..d28740b2c2 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceDataInResponse.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Links;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class ResourceDataInResponse<TResource> : ResourceData
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs
similarity index 88%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs
index a04552631b..71700b66bc 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInRequest.cs
@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs
similarity index 85%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs
index 3c089242b9..e9d06e5f96 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/ResourceObjects/ResourceIdentifierInResponse.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 
 // ReSharper disable once UnusedTypeParameter
 internal sealed class ResourceIdentifierInResponse<TResource> : IResourceIdentity
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPathParameter.cs
similarity index 77%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPathParameter.cs
index 00038fb942..9edc5af9eb 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPathParameter.cs
@@ -1,6 +1,6 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class JsonApiPathParameter
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiPropertyName.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPropertyName.cs
similarity index 92%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiPropertyName.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPropertyName.cs
index cdfcec9879..1526450f16 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiPropertyName.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiPropertyName.cs
@@ -1,6 +1,6 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class JsonApiPropertyName
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
index fe259a393c..c9145ab999 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRoutingTemplate.cs
similarity index 91%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRoutingTemplate.cs
index 28ef680bbd..62d118ea56 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRoutingTemplate.cs
@@ -1,6 +1,6 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class JsonApiRoutingTemplate
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaFacts.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
similarity index 90%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiSchemaFacts.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
index 3a97d1b892..bc2eea877c 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaFacts.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
@@ -1,9 +1,9 @@
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class JsonApiSchemaFacts
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs
index 782881dc8c..761fdc0569 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs
@@ -1,14 +1,14 @@
 using System.Text.Json;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class JsonApiSchemaIdSelector
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ObjectExtensions.cs
similarity index 91%
rename from src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ObjectExtensions.cs
index d2587a1b91..24a65e8afa 100644
--- a/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ObjectExtensions.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class ObjectExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/OpenApiDescriptionLinkProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiDescriptionLinkProvider.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/OpenApiDescriptionLinkProvider.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiDescriptionLinkProvider.cs
index 5a469875e3..8b92f120b6 100644
--- a/src/JsonApiDotNetCore.OpenApi/OpenApiDescriptionLinkProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiDescriptionLinkProvider.cs
@@ -3,7 +3,7 @@
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 /// <summary>
 /// Provides the OpenAPI URL for the "describedby" link in https://jsonapi.org/format/#document-top-level.
diff --git a/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
similarity index 98%
rename from src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
index 00c344b877..d6188e9631 100644
--- a/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
@@ -3,13 +3,13 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 /// <summary>
 /// Sets metadata on controllers for OpenAPI documentation generation by Swagger. Only targets JsonApiDotNetCore controllers.
diff --git a/src/JsonApiDotNetCore.OpenApi/OpenApiOperationIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/OpenApiOperationIdSelector.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
index 2bf991f101..f9fc3da6a2 100644
--- a/src/JsonApiDotNetCore.OpenApi/OpenApiOperationIdSelector.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
@@ -3,13 +3,13 @@
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class OpenApiOperationIdSelector
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/OpenApiSchemaExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiSchemaExtensions.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/OpenApiSchemaExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiSchemaExtensions.cs
index 5390733042..06550080a9 100644
--- a/src/JsonApiDotNetCore.OpenApi/OpenApiSchemaExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiSchemaExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.OpenApi.Models;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class OpenApiSchemaExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/ParameterInfoWrapper.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ParameterInfoWrapper.cs
similarity index 98%
rename from src/JsonApiDotNetCore.OpenApi/ParameterInfoWrapper.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ParameterInfoWrapper.cs
index cc4e2c1adc..d00c51c94d 100644
--- a/src/JsonApiDotNetCore.OpenApi/ParameterInfoWrapper.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ParameterInfoWrapper.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 /// <summary>
 /// Used for parameters in action method expansion. Changes the parameter name and type, while still using all metadata of the underlying non-expanded
diff --git a/src/JsonApiDotNetCore.OpenApi/ResourceFieldValidationMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ResourceFieldValidationMetadataProvider.cs
similarity index 98%
rename from src/JsonApiDotNetCore.OpenApi/ResourceFieldValidationMetadataProvider.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ResourceFieldValidationMetadataProvider.cs
index 82d59ac40d..0b4cdf142b 100644
--- a/src/JsonApiDotNetCore.OpenApi/ResourceFieldValidationMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ResourceFieldValidationMetadataProvider.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class ResourceFieldValidationMetadataProvider
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs
index bffecf1a22..d2d1220d30 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs
@@ -1,15 +1,15 @@
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
 
 /// <summary>
 /// Generates the OpenAPI component schema for an atomic:operations request/response body.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/BodySchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/BodySchemaGenerator.cs
similarity index 93%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/BodySchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/BodySchemaGenerator.cs
index f14f635ad1..dfbbc4538c 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/BodySchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/BodySchemaGenerator.cs
@@ -1,9 +1,9 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
 
 /// <summary>
 /// Generates the OpenAPI component schema for a request and/or response body.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs
similarity index 88%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs
index 4f33d4700b..a655dd3de4 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ErrorResponseBodySchemaGenerator.cs
@@ -1,11 +1,11 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
 
 /// <summary>
 /// Generates the OpenAPI component schema for an error document.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs
similarity index 90%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs
index 7fa6a1cfa5..eadabfb467 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs
@@ -1,12 +1,12 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
 
 /// <summary>
 /// Generates the OpenAPI component schema for a resource/relationship request/response body.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
index 5c29c327ec..75210ec5c8 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
@@ -1,10 +1,10 @@
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.AtomicOperations;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class AbstractAtomicOperationSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
similarity index 93%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
index 2a09f76c0a..767dd73067 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
@@ -1,12 +1,12 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class AbstractResourceDataSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs
similarity index 94%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs
index 8bf5244575..b36aae77d7 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AtomicOperationCodeSchemaGenerator.cs
@@ -3,7 +3,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class AtomicOperationCodeSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataContainerSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataContainerSchemaGenerator.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataContainerSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataContainerSchemaGenerator.cs
index 3fa9ba1986..d03ba0e116 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataContainerSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataContainerSchemaGenerator.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 /// <summary>
 /// Generates the reference schema for the Data property in a request or response schema, taking schema inheritance into account.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataSchemaGenerator.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataSchemaGenerator.cs
index b30a09da38..97fea75d6e 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/DataSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataSchemaGenerator.cs
@@ -1,11 +1,11 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class DataSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs
index dae143eca4..4414c236e8 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs
@@ -1,13 +1,13 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 /// <summary>
 /// Hides links that are never returned.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/MetaSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/MetaSchemaGenerator.cs
similarity index 88%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/MetaSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/MetaSchemaGenerator.cs
index 544627c1a5..7d298d80f9 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/MetaSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/MetaSchemaGenerator.cs
@@ -1,8 +1,8 @@
-using JsonApiDotNetCore.OpenApi.JsonApiObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class MetaSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs
index d3bde23d07..dff37a0b11 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs
@@ -1,10 +1,10 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class RelationshipIdentifierSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs
similarity index 94%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs
index ba8d7e8861..5a4ee81fe6 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipNameSchemaGenerator.cs
@@ -3,7 +3,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class RelationshipNameSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs
index d767da64e9..6549f4676e 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdSchemaGenerator.cs
@@ -2,7 +2,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class ResourceIdSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs
similarity index 95%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs
index 829ca7ffd1..21db71ee7e 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceIdentifierSchemaGenerator.cs
@@ -1,9 +1,9 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class ResourceIdentifierSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs
similarity index 94%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs
index f5399618d7..7fd9fc4d96 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/ResourceTypeSchemaGenerator.cs
@@ -3,7 +3,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class ResourceTypeSchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/GenerationCacheSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/GenerationCacheSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
index c361793db6..c4427bfc6a 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/GenerationCacheSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
@@ -1,12 +1,12 @@
 using System.Reflection;
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;
 
 /// <summary>
 /// Provides access to cached state, which is stored in a temporary schema in <see cref="SchemaRepository" /> during schema generation.
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
similarity index 92%
rename from src/JsonApiDotNetCore.OpenApi/SchemaGenerators/JsonApiSchemaGenerator.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
index a451a45fd8..5c2058c96d 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaGenerators/JsonApiSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
@@ -1,12 +1,12 @@
 using System.Reflection;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SchemaGenerators;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;
 
 internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SchemaRepositoryExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/SchemaRepositoryExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs
index dd4cb3296c..24694ae781 100644
--- a/src/JsonApiDotNetCore.OpenApi/SchemaRepositoryExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs
@@ -2,7 +2,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class SchemaRepositoryExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
similarity index 89%
rename from src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
index 3db60986aa..f7c26217d1 100644
--- a/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Bodies;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
-using JsonApiDotNetCore.OpenApi.SwaggerComponents;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Bodies;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using JsonApiDotNetCore.Serialization.Response;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
@@ -11,14 +11,14 @@
 using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Adds the OpenAPI integration to JsonApiDotNetCore by configuring Swashbuckle.
+    /// Configures OpenAPI for JsonApiDotNetCore using Swashbuckle.
     /// </summary>
-    public static void AddOpenApi(this IServiceCollection services, Action<SwaggerGenOptions>? setupSwaggerGenAction = null)
+    public static void AddOpenApiForJsonApi(this IServiceCollection services, Action<SwaggerGenOptions>? setupSwaggerGenAction = null)
     {
         ArgumentGuard.NotNull(services);
 
diff --git a/src/JsonApiDotNetCore.OpenApi/StringExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/StringExtensions.cs
similarity index 86%
rename from src/JsonApiDotNetCore.OpenApi/StringExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/StringExtensions.cs
index eff26f712c..7f4c9c424f 100644
--- a/src/JsonApiDotNetCore.OpenApi/StringExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/StringExtensions.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class StringExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/DocumentationOpenApiOperationFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
similarity index 99%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
index 04d7048dd9..fd57d53752 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
@@ -13,7 +13,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class DocumentationOpenApiOperationFilter : IOperationFilter
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs
similarity index 96%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs
index c16cbe28d9..2adcd185df 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs
@@ -3,7 +3,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class EndpointOrderingFilter : IDocumentFilter
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs
similarity index 98%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs
index 876eef26bc..55342cb90a 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs
@@ -4,7 +4,7 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 /// <summary>
 /// For schema generation, we rely on <see cref="JsonSerializerDataContractResolver" /> from Swashbuckle for all but our own JSON:API types.
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceDocumentationReader.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceDocumentationReader.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceDocumentationReader.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceDocumentationReader.cs
index fe7661a4bc..2a2b091908 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceDocumentationReader.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceDocumentationReader.cs
@@ -5,7 +5,7 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 internal sealed class ResourceDocumentationReader
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldSchemaBuilder.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceFieldSchemaBuilder.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldSchemaBuilder.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceFieldSchemaBuilder.cs
index eeb3017cbd..bf9bd68dd3 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldSchemaBuilder.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceFieldSchemaBuilder.cs
@@ -1,12 +1,12 @@
 using System.Reflection;
-using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
-using JsonApiDotNetCore.OpenApi.SchemaGenerators.Components;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 internal sealed class ResourceFieldSchemaBuilder
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceTypeInfo.cs
similarity index 94%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceTypeInfo.cs
index 60ee4cb9ae..2c8af26e20 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ResourceTypeInfo.cs
@@ -1,6 +1,6 @@
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 internal sealed class ResourceTypeInfo
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ServerDocumentFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ServerDocumentFilter.cs
similarity index 93%
rename from src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ServerDocumentFilter.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ServerDocumentFilter.cs
index 0281dc4b38..4dc74e4cd0 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ServerDocumentFilter.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/ServerDocumentFilter.cs
@@ -3,7 +3,7 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class ServerDocumentFilter : IDocumentFilter
diff --git a/src/JsonApiDotNetCore.OpenApi/TypeExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/TypeExtensions.cs
similarity index 83%
rename from src/JsonApiDotNetCore.OpenApi/TypeExtensions.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/TypeExtensions.cs
index 15a0ef9fb1..aaea265368 100644
--- a/src/JsonApiDotNetCore.OpenApi/TypeExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/TypeExtensions.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class TypeExtensions
 {
diff --git a/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnreachableCodeException.cs
similarity index 67%
rename from src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnreachableCodeException.cs
index 23af0fb0fc..05ac0193ef 100644
--- a/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnreachableCodeException.cs
@@ -1,3 +1,3 @@
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class UnreachableCodeException() : Exception("This code should not be reachable.");
diff --git a/src/JsonApiDotNetCore.OpenApi/UnusedComponentSchemaCleaner.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnusedComponentSchemaCleaner.cs
similarity index 97%
rename from src/JsonApiDotNetCore.OpenApi/UnusedComponentSchemaCleaner.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnusedComponentSchemaCleaner.cs
index fd0e553998..7270565e7c 100644
--- a/src/JsonApiDotNetCore.OpenApi/UnusedComponentSchemaCleaner.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/UnusedComponentSchemaCleaner.cs
@@ -4,7 +4,7 @@
 using Microsoft.OpenApi.Services;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 /// <summary>
 /// Removes unreferenced component schemas from the OpenAPI document.
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs
deleted file mode 100644
index b94d2d8037..0000000000
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
-
-internal interface IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs b/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs
index 25eb18425c..5756b5e845 100644
--- a/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs
+++ b/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi")]
+[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi.Swashbuckle")]
 [assembly: InternalsVisibleTo("Benchmarks")]
 [assembly: InternalsVisibleTo("DapperExample")]
 [assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")]
diff --git a/test/OpenApiTests/OpenApiStartup.cs b/test/OpenApiTests/OpenApiStartup.cs
index 86e964cc49..bc5f50ffe6 100644
--- a/test/OpenApiTests/OpenApiStartup.cs
+++ b/test/OpenApiTests/OpenApiStartup.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi;
+using JsonApiDotNetCore.OpenApi.Swashbuckle;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.SwaggerGen;
@@ -15,7 +15,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         base.ConfigureServices(services);
 
-        services.AddOpenApi(SetupSwaggerGenAction);
+        services.AddOpenApiForJsonApi(SetupSwaggerGenAction);
     }
 
     protected override void SetJsonApiOptions(JsonApiOptions options)
diff --git a/test/OpenApiTests/OpenApiTests.csproj b/test/OpenApiTests/OpenApiTests.csproj
index 09797c657e..8a853acbf6 100644
--- a/test/OpenApiTests/OpenApiTests.csproj
+++ b/test/OpenApiTests/OpenApiTests.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
       ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Swashbuckle\JsonApiDotNetCore.OpenApi.Swashbuckle.csproj" />
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
   </ItemGroup>