diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index 8f8e806655..840812426a 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -7,6 +7,7 @@ Licensed under Apache License v2.0 with Runtime Library Exception
 See https://swift.org/LICENSE.txt for license information
 #]]
 
+add_subdirectory(DocCCommon)
 add_subdirectory(SwiftDocC)
 add_subdirectory(SwiftDocCUtilities)
 add_subdirectory(docc)
diff --git a/Sources/DocCCommon/CMakeLists.txt b/Sources/DocCCommon/CMakeLists.txt
new file mode 100644
index 0000000000..a393257167
--- /dev/null
+++ b/Sources/DocCCommon/CMakeLists.txt
@@ -0,0 +1,11 @@
+#[[
+This source file is part of the Swift open source project
+
+Copyright © 2014 - 2025 Apple Inc. and the Swift project authors
+Licensed under Apache License v2.0 with Runtime Library Exception
+
+See https://swift.org/LICENSE.txt for license information
+#]]
+
+add_library(DocCCommon STATIC
+  SourceLanguage.swift)
diff --git a/Sources/SwiftDocC/CMakeLists.txt b/Sources/SwiftDocC/CMakeLists.txt
index 6a54c8c802..c5e6ef0e26 100644
--- a/Sources/SwiftDocC/CMakeLists.txt
+++ b/Sources/SwiftDocC/CMakeLists.txt
@@ -10,13 +10,13 @@ See https://swift.org/LICENSE.txt for license information
 add_library(SwiftDocC
   Benchmark/Benchmark.swift
   Benchmark/BenchmarkResults.swift
+  Benchmark/Metrics.swift
   Benchmark/Metrics/Duration.swift
   Benchmark/Metrics/ExternalTopicsHash.swift
   Benchmark/Metrics/OutputSize.swift
   Benchmark/Metrics/PeakMemory.swift
   Benchmark/Metrics/TopicAnchorHash.swift
   Benchmark/Metrics/TopicGraphHash.swift
-  Benchmark/Metrics.swift
   "Catalog Processing/GeneratedCurationWriter.swift"
   Checker/Checker.swift
   Checker/Checkers/AbstractContainsFormattedTextOnly.swift
@@ -198,16 +198,16 @@ add_library(SwiftDocC
   Model/Rendering/RenderContentCompiler.swift
   Model/Rendering/RenderContentConvertible.swift
   Model/Rendering/RenderContext.swift
+  Model/Rendering/RenderNode.Tag.swift
+  Model/Rendering/RenderNode.swift
+  Model/Rendering/RenderNodeTranslator.swift
+  Model/Rendering/RenderNodeVariant.swift
   Model/Rendering/RenderNode/AnyMetadata.swift
   Model/Rendering/RenderNode/CodableContentSection.swift
   Model/Rendering/RenderNode/CodableRenderReference.swift
   Model/Rendering/RenderNode/CodableRenderSection.swift
   Model/Rendering/RenderNode/RenderMetadata.swift
   Model/Rendering/RenderNode/RenderNode+Codable.swift
-  Model/Rendering/RenderNode.swift
-  Model/Rendering/RenderNode.Tag.swift
-  Model/Rendering/RenderNodeTranslator.swift
-  Model/Rendering/RenderNodeVariant.swift
   Model/Rendering/RenderReferenceStore.swift
   Model/Rendering/RenderSection.swift
   Model/Rendering/RenderSectionTranslator/AttributesSectionTranslator.swift
@@ -238,22 +238,22 @@ add_library(SwiftDocC
   Model/Rendering/Symbol/PossibleValuesRenderSection.swift
   Model/Rendering/Symbol/PropertiesRenderSection.swift
   Model/Rendering/Symbol/PropertyListDetailsRenderSection.swift
-  Model/Rendering/Symbol/RelationshipsRenderSection.swift
   Model/Rendering/Symbol/RESTBodyRenderSection.swift
   Model/Rendering/Symbol/RESTEndpointRenderSection.swift
   Model/Rendering/Symbol/RESTExampleRenderSection.swift
   Model/Rendering/Symbol/RESTParametersRenderSection.swift
   Model/Rendering/Symbol/RESTResponseRenderSection.swift
+  Model/Rendering/Symbol/RelationshipsRenderSection.swift
   Model/Rendering/Symbol/SampleDownloadSection.swift
   Model/Rendering/Symbol/TaskGroupRenderSection.swift
   Model/Rendering/TopicsSectionStyle.swift
+  "Model/Rendering/Tutorial Article/TutorialArticleSection.swift"
   Model/Rendering/Tutorial/LineHighlighter.swift
   Model/Rendering/Tutorial/References/DownloadReference.swift
   Model/Rendering/Tutorial/References/XcodeRequirementReference.swift
   Model/Rendering/Tutorial/Sections/IntroRenderSection.swift
   Model/Rendering/Tutorial/Sections/TutorialAssessmentsRenderSection.swift
   Model/Rendering/Tutorial/Sections/TutorialSectionsRenderSection.swift
-  "Model/Rendering/Tutorial Article/TutorialArticleSection.swift"
   "Model/Rendering/Tutorials Overview/Resources/RenderTile.swift"
   "Model/Rendering/Tutorials Overview/Sections/CallToActionSection.swift"
   "Model/Rendering/Tutorials Overview/Sections/ContentAndMediaGroupSection.swift"
@@ -299,7 +299,6 @@ add_library(SwiftDocC
   Model/Semantics/Parameter.swift
   Model/Semantics/Return.swift
   Model/Semantics/Throw.swift
-  Model/SourceLanguage.swift
   Model/TaskGroup.swift
   Semantics/Abstracted.swift
   Semantics/Article/Article.swift
@@ -358,11 +357,11 @@ add_library(SwiftDocC
   Semantics/Options/TopicsVisualStyle.swift
   Semantics/Redirect.swift
   Semantics/Redirected.swift
+  Semantics/ReferenceResolver.swift
   Semantics/Reference/Links.swift
   Semantics/Reference/Row.swift
   Semantics/Reference/Small.swift
   Semantics/Reference/TabNavigator.swift
-  Semantics/ReferenceResolver.swift
   Semantics/Semantic.swift
   Semantics/SemanticAnalyzer.swift
   Semantics/Snippets/Snippet.swift
@@ -381,6 +380,8 @@ add_library(SwiftDocC
   Semantics/Technology/Volume/Volume.swift
   Semantics/Timed.swift
   Semantics/Titled.swift
+  Semantics/TutorialArticle/Stack.swift
+  Semantics/TutorialArticle/TutorialArticle.swift
   Semantics/Tutorial/Assessments/Assessments.swift
   "Semantics/Tutorial/Assessments/Multiple Choice/Choice/Choice.swift"
   "Semantics/Tutorial/Assessments/Multiple Choice/Choice/Justification.swift"
@@ -391,8 +392,6 @@ add_library(SwiftDocC
   Semantics/Tutorial/Tasks/TutorialSection.swift
   Semantics/Tutorial/Tutorial.swift
   Semantics/Tutorial/XcodeRequirement.swift
-  Semantics/TutorialArticle/Stack.swift
-  Semantics/TutorialArticle/TutorialArticle.swift
   Semantics/Visitor/SemanticVisitor.swift
   Semantics/Walker/SemanticWalker.swift
   Semantics/Walker/Walkers/SemanticTreeDumper.swift
@@ -402,6 +401,7 @@ add_library(SwiftDocC
   Utility/Checksum.swift
   Utility/Collection+ConcurrentPerform.swift
   Utility/CollectionChanges.swift
+  Utility/CommonTypeExports.swift
   Utility/DataStructures/BidirectionalMap.swift
   Utility/DataStructures/GroupedSequence.swift
   Utility/DispatchGroup+Async.swift
@@ -440,14 +440,14 @@ add_library(SwiftDocC
   Utility/Graphs/DirectedGraph+Paths.swift
   Utility/Graphs/DirectedGraph+Traversal.swift
   Utility/Graphs/DirectedGraph.swift
-  Utility/Language/EnglishLanguage.swift
-  Utility/Language/NativeLanguage.swift
-  Utility/ListItemUpdatable.swift
   Utility/LMDB/LMDB+Database.swift
   Utility/LMDB/LMDB+Environment.swift
   Utility/LMDB/LMDB+Error.swift
   Utility/LMDB/LMDB+Transaction.swift
   Utility/LMDB/LMDB.swift
+  Utility/Language/EnglishLanguage.swift
+  Utility/Language/NativeLanguage.swift
+  Utility/ListItemUpdatable.swift
   Utility/LogHandle.swift
   Utility/MarkupExtensions/AnyLink.swift
   Utility/MarkupExtensions/BlockDirectiveExtensions.swift
@@ -463,6 +463,8 @@ add_library(SwiftDocC
   Utility/Synchronization.swift
   Utility/ValidatedURL.swift
   Utility/Version.swift)
+target_link_libraries(SwiftDocC PRIVATE
+  DocCCommon)
 target_link_libraries(SwiftDocC PUBLIC
   SwiftMarkdown::Markdown
   DocC::SymbolKit
diff --git a/Sources/CommandLine/CMakeLists.txt b/Sources/SwiftDocCUtilities/CMakeLists.txt
similarity index 100%
rename from Sources/CommandLine/CMakeLists.txt
rename to Sources/SwiftDocCUtilities/CMakeLists.txt