diff --git a/docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md b/docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md
index 941730ef4..180a1d838 100644
--- a/docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md
+++ b/docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md
@@ -40,7 +40,7 @@ The above options allow you to bring over a sub-set of the WIs (using the `WIQLQ
 
 Using the above sample structure, if you wanted to map the source project `Team 1` to target project `Team A` etc. you could add the field map as follows
 
-A complete list of [FieldMaps](../Reference/FieldMaps/index.md) are available.
+A complete list of [FieldMaps](../FieldMaps/index.md) are available.
 
 ```
  "FieldMaps": [
diff --git a/docs/_data/reference.endpoints.azuredevopsendpoint.yaml b/docs/_data/reference.endpoints.azuredevopsendpoint.yaml
index 76e266d5f..4a7ec831b 100644
--- a/docs/_data/reference.endpoints.azuredevopsendpoint.yaml
+++ b/docs/_data/reference.endpoints.azuredevopsendpoint.yaml
@@ -66,5 +66,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpoint.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpointOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpointOptions.cs
diff --git a/docs/_data/reference.endpoints.tfsendpoint.yaml b/docs/_data/reference.endpoints.tfsendpoint.yaml
index 1ca4d5b03..c71d8fe69 100644
--- a/docs/_data/reference.endpoints.tfsendpoint.yaml
+++ b/docs/_data/reference.endpoints.tfsendpoint.yaml
@@ -117,5 +117,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsEndpointOptions.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsEndpointOptions.cs
diff --git a/docs/_data/reference.endpoints.tfsteamprojectendpoint.yaml b/docs/_data/reference.endpoints.tfsteamprojectendpoint.yaml
index ec65a973d..d1042a70f 100644
--- a/docs/_data/reference.endpoints.tfsteamprojectendpoint.yaml
+++ b/docs/_data/reference.endpoints.tfsteamprojectendpoint.yaml
@@ -113,5 +113,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamProjectEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamProjectEndPointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamProjectEndpoint.cs
+optionsClassFile: ''
diff --git a/docs/_data/reference.endpoints.tfsteamsettingsendpoint.yaml b/docs/_data/reference.endpoints.tfsteamsettingsendpoint.yaml
index a9d95738e..538672fe1 100644
--- a/docs/_data/reference.endpoints.tfsteamsettingsendpoint.yaml
+++ b/docs/_data/reference.endpoints.tfsteamsettingsendpoint.yaml
@@ -54,5 +54,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamSettingsEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamSettingsEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamSettingsEndpointOptions.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamSettingsEndpointOptions.cs
diff --git a/docs/_data/reference.endpoints.tfsworkitemendpoint.yaml b/docs/_data/reference.endpoints.tfsworkitemendpoint.yaml
index 234699661..ef2c76b2c 100644
--- a/docs/_data/reference.endpoints.tfsworkitemendpoint.yaml
+++ b/docs/_data/reference.endpoints.tfsworkitemendpoint.yaml
@@ -59,5 +59,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsWorkItemEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsWorkItemEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsWorkItemEndpoint.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsWorkItemEndpointOptions.cs
diff --git a/docs/_data/reference.fieldmaps.fieldtofieldmap.yaml b/docs/_data/reference.fieldmaps.fieldtofieldmap.yaml
index 0ba38b5fd..b9502676b 100644
--- a/docs/_data/reference.fieldmaps.fieldtofieldmap.yaml
+++ b/docs/_data/reference.fieldmaps.fieldtofieldmap.yaml
@@ -87,4 +87,4 @@ options:
 status: missing XML code comments
 processingTarget: missing XML code comments
 classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToFieldMap.cs
-optionsClassFile: src/MigrationTools/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMapOptions.cs
+optionsClassFile: ''
diff --git a/docs/_data/reference.fieldmaps.fieldtofieldmultimap.yaml b/docs/_data/reference.fieldmaps.fieldtofieldmultimap.yaml
index 398b98c20..74571c023 100644
--- a/docs/_data/reference.fieldmaps.fieldtofieldmultimap.yaml
+++ b/docs/_data/reference.fieldmaps.fieldtofieldmultimap.yaml
@@ -82,5 +82,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMap.cs
-optionsClassFile: src/MigrationTools/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMapOptions.cs
+classFile: ''
+optionsClassFile: ''
diff --git a/docs/_data/reference.processorenrichers.pauseaftereachitem.yaml b/docs/_data/reference.processorenrichers.pauseaftereachitem.yaml
index c5d39db87..14ce25d24 100644
--- a/docs/_data/reference.processorenrichers.pauseaftereachitem.yaml
+++ b/docs/_data/reference.processorenrichers.pauseaftereachitem.yaml
@@ -41,5 +41,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItem.cs
+classFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItemOptions.cs
 optionsClassFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItemOptions.cs
diff --git a/docs/_data/reference.processors.azuredevopspipelineprocessor.yaml b/docs/_data/reference.processors.azuredevopspipelineprocessor.yaml
index 54fd30948..3c7e6bce7 100644
--- a/docs/_data/reference.processors.azuredevopspipelineprocessor.yaml
+++ b/docs/_data/reference.processors.azuredevopspipelineprocessor.yaml
@@ -121,5 +121,5 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Pipelines
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessorOptions.cs
diff --git a/docs/_data/reference.processors.keepoutboundlinktargetprocessor.yaml b/docs/_data/reference.processors.keepoutboundlinktargetprocessor.yaml
index 8dfe8fb6d..217c18fc1 100644
--- a/docs/_data/reference.processors.keepoutboundlinktargetprocessor.yaml
+++ b/docs/_data/reference.processors.keepoutboundlinktargetprocessor.yaml
@@ -20,7 +20,7 @@ configurationSamples:
       "Enabled": false,
       "WIQLQuery": "Select [System.Id] From WorkItems Where [System.TeamProject] = @project and not [System.WorkItemType] contains 'Test Suite, Test Plan,Shared Steps,Shared Parameter,Feedback Request'",
       "TargetLinksToKeepOrganization": "https://dev.azure.com/nkdagility",
-      "TargetLinksToKeepProject": "8950f163-3d8d-48d4-b14a-b7b250903fe1",
+      "TargetLinksToKeepProject": "df1a9cb1-115a-43f2-8034-d50128fee331",
       "CleanupFileName": "c:/temp/OutboundLinkTargets.bat",
       "PrependCommand": "start",
       "DryRun": true,
@@ -71,5 +71,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessorOptions.cs
diff --git a/docs/_data/reference.processors.outboundlinkcheckingprocessor.yaml b/docs/_data/reference.processors.outboundlinkcheckingprocessor.yaml
index cd2d5aff5..384527350 100644
--- a/docs/_data/reference.processors.outboundlinkcheckingprocessor.yaml
+++ b/docs/_data/reference.processors.outboundlinkcheckingprocessor.yaml
@@ -51,5 +51,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsexportprofilepicturefromadprocessor.yaml b/docs/_data/reference.processors.tfsexportprofilepicturefromadprocessor.yaml
index 3f402b02e..d52ab79a5 100644
--- a/docs/_data/reference.processors.tfsexportprofilepicturefromadprocessor.yaml
+++ b/docs/_data/reference.processors.tfsexportprofilepicturefromadprocessor.yaml
@@ -61,5 +61,5 @@ options:
   defaultValue: String.Empty
 status: alpha
 processingTarget: Profiles
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsexportusersformappingprocessor.yaml b/docs/_data/reference.processors.tfsexportusersformappingprocessor.yaml
index cfc2eb254..c8aa2978c 100644
--- a/docs/_data/reference.processors.tfsexportusersformappingprocessor.yaml
+++ b/docs/_data/reference.processors.tfsexportusersformappingprocessor.yaml
@@ -61,5 +61,5 @@ options:
   defaultValue: missing XML code comments
 status: ready
 processingTarget: Work Items
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsimportprofilepictureprocessor.yaml b/docs/_data/reference.processors.tfsimportprofilepictureprocessor.yaml
index 5f479a69f..bebc256e8 100644
--- a/docs/_data/reference.processors.tfsimportprofilepictureprocessor.yaml
+++ b/docs/_data/reference.processors.tfsimportprofilepictureprocessor.yaml
@@ -41,5 +41,5 @@ options:
   defaultValue: missing XML code comments
 status: alpha
 processingTarget: Profiles
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfssharedqueryprocessor.yaml b/docs/_data/reference.processors.tfssharedqueryprocessor.yaml
index ed16864c6..92cc90a9c 100644
--- a/docs/_data/reference.processors.tfssharedqueryprocessor.yaml
+++ b/docs/_data/reference.processors.tfssharedqueryprocessor.yaml
@@ -56,5 +56,5 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Queries
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsteamsettingsprocessor.yaml b/docs/_data/reference.processors.tfsteamsettingsprocessor.yaml
index a5d73cd1a..c4a6a4922 100644
--- a/docs/_data/reference.processors.tfsteamsettingsprocessor.yaml
+++ b/docs/_data/reference.processors.tfsteamsettingsprocessor.yaml
@@ -71,5 +71,5 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Teams
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsworkitemdeleteprocessor.yaml b/docs/_data/reference.processors.tfsworkitemdeleteprocessor.yaml
index 4679fcbb9..9cf74dc00 100644
--- a/docs/_data/reference.processors.tfsworkitemdeleteprocessor.yaml
+++ b/docs/_data/reference.processors.tfsworkitemdeleteprocessor.yaml
@@ -66,5 +66,5 @@ options:
   defaultValue: missing XML code comments
 status: ready
 processingTarget: WorkItem
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessorOptions.cs
diff --git a/docs/_data/reference.processors.tfsworkitemmigrationprocessor.yaml b/docs/_data/reference.processors.tfsworkitemmigrationprocessor.yaml
index df8fa2fbe..a6894eb03 100644
--- a/docs/_data/reference.processors.tfsworkitemmigrationprocessor.yaml
+++ b/docs/_data/reference.processors.tfsworkitemmigrationprocessor.yaml
@@ -117,5 +117,5 @@ options:
   defaultValue: 5
 status: ready
 processingTarget: Work Items
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessorOptions.cs
diff --git a/docs/_data/reference.processors.workitemtrackingprocessor.yaml b/docs/_data/reference.processors.workitemtrackingprocessor.yaml
index aa66e76c0..d59bfd410 100644
--- a/docs/_data/reference.processors.workitemtrackingprocessor.yaml
+++ b/docs/_data/reference.processors.workitemtrackingprocessor.yaml
@@ -56,5 +56,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Processors/WorkItemTrackingProcessor.cs
+classFile: src/MigrationTools/Processors/WorkItemTrackingProcessorOptions.cs
 optionsClassFile: src/MigrationTools/Processors/WorkItemTrackingProcessorOptions.cs
diff --git a/docs/_data/reference.tools.fieldmappingtool.yaml b/docs/_data/reference.tools.fieldmappingtool.yaml
index 0c433051c..4b58d116f 100644
--- a/docs/_data/reference.tools.fieldmappingtool.yaml
+++ b/docs/_data/reference.tools.fieldmappingtool.yaml
@@ -215,5 +215,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Tools/FieldMappingTool.cs
+classFile: src/MigrationTools/Tools/FieldMappingToolOptions.cs
 optionsClassFile: src/MigrationTools/Tools/FieldMappingToolOptions.cs
diff --git a/docs/_data/reference.tools.tfsattachmenttool.yaml b/docs/_data/reference.tools.tfsattachmenttool.yaml
index 91f48faca..59cb948ac 100644
--- a/docs/_data/reference.tools.tfsattachmenttool.yaml
+++ b/docs/_data/reference.tools.tfsattachmenttool.yaml
@@ -67,5 +67,5 @@ options:
   defaultValue: 480000000
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentToolOptions.cs
diff --git a/docs/_data/reference.tools.tfsgitrepositorytool.yaml b/docs/_data/reference.tools.tfsgitrepositorytool.yaml
index 72b3f7819..faf09aaf6 100644
--- a/docs/_data/reference.tools.tfsgitrepositorytool.yaml
+++ b/docs/_data/reference.tools.tfsgitrepositorytool.yaml
@@ -67,5 +67,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryToolOptions.cs
diff --git a/docs/_data/reference.tools.tfsteamsettingstool.yaml b/docs/_data/reference.tools.tfsteamsettingstool.yaml
index 3ee946172..f77c9499d 100644
--- a/docs/_data/reference.tools.tfsteamsettingstool.yaml
+++ b/docs/_data/reference.tools.tfsteamsettingstool.yaml
@@ -90,5 +90,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsToolOptions.cs
diff --git a/docs/_data/reference.tools.tfsusermappingtool.yaml b/docs/_data/reference.tools.tfsusermappingtool.yaml
index 012f71c9b..58604393b 100644
--- a/docs/_data/reference.tools.tfsusermappingtool.yaml
+++ b/docs/_data/reference.tools.tfsusermappingtool.yaml
@@ -97,5 +97,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingToolOptions.cs
diff --git a/docs/_data/reference.tools.tfsworkitemembededlinktool.yaml b/docs/_data/reference.tools.tfsworkitemembededlinktool.yaml
index 97ad6ca6b..59beaee78 100644
--- a/docs/_data/reference.tools.tfsworkitemembededlinktool.yaml
+++ b/docs/_data/reference.tools.tfsworkitemembededlinktool.yaml
@@ -51,5 +51,5 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkToolOptions.cs
diff --git a/docs/_data/reference.tools.workitemtypemappingtool.yaml b/docs/_data/reference.tools.workitemtypemappingtool.yaml
index 9941dd1ee..ef7040328 100644
--- a/docs/_data/reference.tools.workitemtypemappingtool.yaml
+++ b/docs/_data/reference.tools.workitemtypemappingtool.yaml
@@ -65,5 +65,5 @@ options:
   defaultValue: '{}'
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Tools/WorkItemTypeMappingTool.cs
+classFile: src/MigrationTools/Tools/WorkItemTypeMappingToolOptions.cs
 optionsClassFile: src/MigrationTools/Tools/WorkItemTypeMappingToolOptions.cs
diff --git a/docs/collections/_reference/reference.endpoints.azuredevopsendpoint.md b/docs/collections/_reference/reference.endpoints.azuredevopsendpoint.md
index b961fff2b..8bbb33d42 100644
--- a/docs/collections/_reference/reference.endpoints.azuredevopsendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.azuredevopsendpoint.md
@@ -67,7 +67,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpoint.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpointOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Endpoints/AzureDevOpsEndpointOptions.cs
 
 redirectFrom:
@@ -81,11 +81,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/AzureDevOpsEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/AzureDevOpsEndpoint-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Endpoints/AzureDevOpsEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/AzureDevOpsEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.endpoints.filesystemworkitemendpoint.md b/docs/collections/_reference/reference.endpoints.filesystemworkitemendpoint.md
index 90c6e78c1..224c5a28a 100644
--- a/docs/collections/_reference/reference.endpoints.filesystemworkitemendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.filesystemworkitemendpoint.md
@@ -46,11 +46,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/FileSystemWorkItemEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/FileSystemWorkItemEndpoint-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Endpoints/FileSystemWorkItemEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/FileSystemWorkItemEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.endpoints.tfsendpoint.md b/docs/collections/_reference/reference.endpoints.tfsendpoint.md
index d2c0a8db0..b71c15493 100644
--- a/docs/collections/_reference/reference.endpoints.tfsendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.tfsendpoint.md
@@ -118,8 +118,8 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsEndpointOptions.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsEndpointOptions.cs
 
 redirectFrom:
 - /Reference/Endpoints/TfsEndpointOptions/
@@ -132,11 +132,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/TfsEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/TfsEndpoint-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Endpoints/TfsEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/TfsEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.endpoints.tfsteamprojectendpoint.md b/docs/collections/_reference/reference.endpoints.tfsteamprojectendpoint.md
index 34a3d14e5..de11ace01 100644
--- a/docs/collections/_reference/reference.endpoints.tfsteamprojectendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.tfsteamprojectendpoint.md
@@ -114,8 +114,8 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamProjectEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamProjectEndPointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamProjectEndpoint.cs
+optionsClassFile: ''
 
 redirectFrom:
 - /Reference/Endpoints/TfsTeamProjectEndpointOptions/
@@ -128,11 +128,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/TfsTeamProjectEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/TfsTeamProjectEndpoint-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Endpoints/TfsTeamProjectEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/TfsTeamProjectEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.endpoints.tfsteamsettingsendpoint.md b/docs/collections/_reference/reference.endpoints.tfsteamsettingsendpoint.md
index 20cf9ac67..1f82e5bcb 100644
--- a/docs/collections/_reference/reference.endpoints.tfsteamsettingsendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.tfsteamsettingsendpoint.md
@@ -55,8 +55,8 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamSettingsEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsTeamSettingsEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamSettingsEndpointOptions.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsTeamSettingsEndpointOptions.cs
 
 redirectFrom:
 - /Reference/Endpoints/TfsTeamSettingsEndpointOptions/
@@ -69,11 +69,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/TfsTeamSettingsEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/TfsTeamSettingsEndpoint-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Endpoints/TfsTeamSettingsEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/TfsTeamSettingsEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.endpoints.tfsworkitemendpoint.md b/docs/collections/_reference/reference.endpoints.tfsworkitemendpoint.md
index f0f1f1689..d8977c244 100644
--- a/docs/collections/_reference/reference.endpoints.tfsworkitemendpoint.md
+++ b/docs/collections/_reference/reference.endpoints.tfsworkitemendpoint.md
@@ -60,8 +60,8 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsWorkItemEndpoint.cs
-optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/EndPoints/TfsWorkItemEndpointOptions.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsWorkItemEndpoint.cs
+optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsWorkItemEndpointOptions.cs
 
 redirectFrom:
 - /Reference/Endpoints/TfsWorkItemEndpointOptions/
@@ -74,7 +74,7 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Endpoints/TfsWorkItemEndpoint-notes.md
+  path: ../../docs/Reference/Endpoints/TfsWorkItemEndpoint-notes.md
   exists: true
   markdown: >+
     The Work Item endpoint is super awesome.
@@ -91,7 +91,7 @@ topics:
     FileSystem | Local Files | `FileSystemWorkItemEndpoint` | WorkItems | TBA
 
 - topic: introduction
-  path: /docs/Reference/Endpoints/TfsWorkItemEndpoint-introduction.md
+  path: ../../docs/Reference/Endpoints/TfsWorkItemEndpoint-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldclearmap.md b/docs/collections/_reference/reference.fieldmaps.fieldclearmap.md
index 52df2ef31..3e166434c 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldclearmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldclearmap.md
@@ -89,11 +89,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldClearMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldClearMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldClearMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldClearMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldliteralmap.md b/docs/collections/_reference/reference.fieldmaps.fieldliteralmap.md
index 89130c889..532d89b3b 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldliteralmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldliteralmap.md
@@ -95,11 +95,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldLiteralMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldLiteralMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldLiteralMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldLiteralMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldmergemap.md b/docs/collections/_reference/reference.fieldmaps.fieldmergemap.md
index 863430062..b0b1196a6 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldmergemap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldmergemap.md
@@ -107,11 +107,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldMergeMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldMergeMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldMergeMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldMergeMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldskipmap.md b/docs/collections/_reference/reference.fieldmaps.fieldskipmap.md
index 8c93663e0..96773838c 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldskipmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldskipmap.md
@@ -70,11 +70,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldSkipMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldSkipMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldSkipMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldSkipMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldtofieldmap.md b/docs/collections/_reference/reference.fieldmaps.fieldtofieldmap.md
index e29164389..b1fb00637 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldtofieldmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldtofieldmap.md
@@ -88,7 +88,7 @@ options:
 status: missing XML code comments
 processingTarget: missing XML code comments
 classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToFieldMap.cs
-optionsClassFile: src/MigrationTools/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMapOptions.cs
+optionsClassFile: ''
 
 redirectFrom:
 - /Reference/FieldMaps/FieldToFieldMapOptions/
@@ -101,11 +101,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldToFieldMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldToFieldMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldToFieldMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldToFieldMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldtofieldmultimap.md b/docs/collections/_reference/reference.fieldmaps.fieldtofieldmultimap.md
index b7fdfadc4..d0599805c 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldtofieldmultimap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldtofieldmultimap.md
@@ -83,8 +83,8 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMap.cs
-optionsClassFile: src/MigrationTools/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMapOptions.cs
+classFile: ''
+optionsClassFile: ''
 
 redirectFrom:
 - /Reference/FieldMaps/FieldToFieldMultiMapOptions/
@@ -97,11 +97,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldToFieldMultiMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldToFieldMultiMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldToFieldMultiMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldToFieldMultiMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldtotagfieldmap.md b/docs/collections/_reference/reference.fieldmaps.fieldtotagfieldmap.md
index 0f0ee3241..31a685a24 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldtotagfieldmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldtotagfieldmap.md
@@ -99,11 +99,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldToTagFieldMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldToTagFieldMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldToTagFieldMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldToTagFieldMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.fieldvaluemap.md b/docs/collections/_reference/reference.fieldmaps.fieldvaluemap.md
index ee92bed61..c4adb41f0 100644
--- a/docs/collections/_reference/reference.fieldmaps.fieldvaluemap.md
+++ b/docs/collections/_reference/reference.fieldmaps.fieldvaluemap.md
@@ -111,11 +111,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/FieldValueMap-notes.md
+  path: ../../docs/Reference/FieldMaps/FieldValueMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/FieldValueMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/FieldValueMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.multivalueconditionalmap.md b/docs/collections/_reference/reference.fieldmaps.multivalueconditionalmap.md
index fc7f67093..9dd683aca 100644
--- a/docs/collections/_reference/reference.fieldmaps.multivalueconditionalmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.multivalueconditionalmap.md
@@ -107,11 +107,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/MultiValueConditionalMap-notes.md
+  path: ../../docs/Reference/FieldMaps/MultiValueConditionalMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/MultiValueConditionalMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/MultiValueConditionalMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.regexfieldmap.md b/docs/collections/_reference/reference.fieldmaps.regexfieldmap.md
index a26fd9118..87d45af08 100644
--- a/docs/collections/_reference/reference.fieldmaps.regexfieldmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.regexfieldmap.md
@@ -107,11 +107,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/RegexFieldMap-notes.md
+  path: ../../docs/Reference/FieldMaps/RegexFieldMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/RegexFieldMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/RegexFieldMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.fieldmaps.treetotagfieldmap.md b/docs/collections/_reference/reference.fieldmaps.treetotagfieldmap.md
index 4e8686d41..e52ce8d31 100644
--- a/docs/collections/_reference/reference.fieldmaps.treetotagfieldmap.md
+++ b/docs/collections/_reference/reference.fieldmaps.treetotagfieldmap.md
@@ -75,11 +75,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/FieldMaps/TreeToTagFieldMap-notes.md
+  path: ../../docs/Reference/FieldMaps/TreeToTagFieldMap-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/FieldMaps/TreeToTagFieldMap-introduction.md
+  path: ../../docs/Reference/FieldMaps/TreeToTagFieldMap-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processorenrichers.pauseaftereachitem.md b/docs/collections/_reference/reference.processorenrichers.pauseaftereachitem.md
index a828ba3ff..3905de17a 100644
--- a/docs/collections/_reference/reference.processorenrichers.pauseaftereachitem.md
+++ b/docs/collections/_reference/reference.processorenrichers.pauseaftereachitem.md
@@ -42,7 +42,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItem.cs
+classFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItemOptions.cs
 optionsClassFile: src/MigrationTools/Processors/Enrichers/PauseAfterEachItemOptions.cs
 
 redirectFrom:
@@ -56,11 +56,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/ProcessorEnrichers/PauseAfterEachItem-notes.md
+  path: ../../docs/Reference/ProcessorEnrichers/PauseAfterEachItem-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/ProcessorEnrichers/PauseAfterEachItem-introduction.md
+  path: ../../docs/Reference/ProcessorEnrichers/PauseAfterEachItem-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.azuredevopspipelineprocessor.md b/docs/collections/_reference/reference.processors.azuredevopspipelineprocessor.md
index 8773adcd8..7d261b7ab 100644
--- a/docs/collections/_reference/reference.processors.azuredevopspipelineprocessor.md
+++ b/docs/collections/_reference/reference.processors.azuredevopspipelineprocessor.md
@@ -122,7 +122,7 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Pipelines
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessorOptions.cs
 
 redirectFrom:
@@ -136,7 +136,7 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/AzureDevOpsPipelineProcessor-notes.md
+  path: ../../docs/Reference/Processors/AzureDevOpsPipelineProcessor-notes.md
   exists: true
   markdown: >2-
 
@@ -211,7 +211,7 @@ topics:
 
     When the application is creating service connections make sure you have proper permissions on Azure Active Directory and you can grant Contributor role to the subscription that was chosen.
 - topic: introduction
-  path: /docs/Reference/Processors/AzureDevOpsPipelineProcessor-introduction.md
+  path: ../../docs/Reference/Processors/AzureDevOpsPipelineProcessor-introduction.md
   exists: true
   markdown: >2-
 
diff --git a/docs/collections/_reference/reference.processors.keepoutboundlinktargetprocessor.md b/docs/collections/_reference/reference.processors.keepoutboundlinktargetprocessor.md
index 5f8c60965..6b7408d2a 100644
--- a/docs/collections/_reference/reference.processors.keepoutboundlinktargetprocessor.md
+++ b/docs/collections/_reference/reference.processors.keepoutboundlinktargetprocessor.md
@@ -21,7 +21,7 @@ configurationSamples:
       "Enabled": false,
       "WIQLQuery": "Select [System.Id] From WorkItems Where [System.TeamProject] = @project and not [System.WorkItemType] contains 'Test Suite, Test Plan,Shared Steps,Shared Parameter,Feedback Request'",
       "TargetLinksToKeepOrganization": "https://dev.azure.com/nkdagility",
-      "TargetLinksToKeepProject": "8950f163-3d8d-48d4-b14a-b7b250903fe1",
+      "TargetLinksToKeepProject": "df1a9cb1-115a-43f2-8034-d50128fee331",
       "CleanupFileName": "c:/temp/OutboundLinkTargets.bat",
       "PrependCommand": "start",
       "DryRun": true,
@@ -72,7 +72,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/KeepOutboundLinkTargetProcessorOptions.cs
 
 redirectFrom:
@@ -86,11 +86,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/KeepOutboundLinkTargetProcessor-notes.md
+  path: ../../docs/Reference/Processors/KeepOutboundLinkTargetProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/KeepOutboundLinkTargetProcessor-introduction.md
+  path: ../../docs/Reference/Processors/KeepOutboundLinkTargetProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.outboundlinkcheckingprocessor.md b/docs/collections/_reference/reference.processors.outboundlinkcheckingprocessor.md
index b5711ceb4..53ca05fdf 100644
--- a/docs/collections/_reference/reference.processors.outboundlinkcheckingprocessor.md
+++ b/docs/collections/_reference/reference.processors.outboundlinkcheckingprocessor.md
@@ -52,7 +52,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessor.cs
+classFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.AzureDevops.Rest/Processors/OutboundLinkCheckingProcessorOptions.cs
 
 redirectFrom:
@@ -66,11 +66,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/OutboundLinkCheckingProcessor-notes.md
+  path: ../../docs/Reference/Processors/OutboundLinkCheckingProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/OutboundLinkCheckingProcessor-introduction.md
+  path: ../../docs/Reference/Processors/OutboundLinkCheckingProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.processdefinitionprocessor.md b/docs/collections/_reference/reference.processors.processdefinitionprocessor.md
index 81400e146..4f44753fb 100644
--- a/docs/collections/_reference/reference.processors.processdefinitionprocessor.md
+++ b/docs/collections/_reference/reference.processors.processdefinitionprocessor.md
@@ -76,9 +76,9 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/ProcessDefinitionProcessor-notes.md
+  path: ../../docs/Reference/Processors/ProcessDefinitionProcessor-notes.md
   exists: true
-  markdown: >2+
+  markdown: >2
 
     ## Example 
 
@@ -120,7 +120,7 @@ topics:
 
     ```
 - topic: introduction
-  path: /docs/Reference/Processors/ProcessDefinitionProcessor-introduction.md
+  path: ../../docs/Reference/Processors/ProcessDefinitionProcessor-introduction.md
   exists: true
   markdown: >2-
 
diff --git a/docs/collections/_reference/reference.processors.tfsexportprofilepicturefromadprocessor.md b/docs/collections/_reference/reference.processors.tfsexportprofilepicturefromadprocessor.md
index 0059368fd..8f7a48d49 100644
--- a/docs/collections/_reference/reference.processors.tfsexportprofilepicturefromadprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsexportprofilepicturefromadprocessor.md
@@ -62,7 +62,7 @@ options:
   defaultValue: String.Empty
 status: alpha
 processingTarget: Profiles
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportProfilePictureFromADProcessorOptions.cs
 
 redirectFrom:
@@ -76,11 +76,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsExportProfilePictureFromADProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsExportProfilePictureFromADProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsExportProfilePictureFromADProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsExportProfilePictureFromADProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsexportusersformappingprocessor.md b/docs/collections/_reference/reference.processors.tfsexportusersformappingprocessor.md
index 1709cfef0..28cc8818f 100644
--- a/docs/collections/_reference/reference.processors.tfsexportusersformappingprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsexportusersformappingprocessor.md
@@ -62,7 +62,7 @@ options:
   defaultValue: missing XML code comments
 status: ready
 processingTarget: Work Items
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessorOptions.cs
 
 redirectFrom:
@@ -76,11 +76,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsExportUsersForMappingProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsExportUsersForMappingProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsExportUsersForMappingProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsExportUsersForMappingProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsimportprofilepictureprocessor.md b/docs/collections/_reference/reference.processors.tfsimportprofilepictureprocessor.md
index 3e0a0db9a..c1e3e498d 100644
--- a/docs/collections/_reference/reference.processors.tfsimportprofilepictureprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsimportprofilepictureprocessor.md
@@ -42,7 +42,7 @@ options:
   defaultValue: missing XML code comments
 status: alpha
 processingTarget: Profiles
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsImportProfilePictureProcessorOptions.cs
 
 redirectFrom:
@@ -56,11 +56,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsImportProfilePictureProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsImportProfilePictureProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsImportProfilePictureProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsImportProfilePictureProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfssharedqueryprocessor.md b/docs/collections/_reference/reference.processors.tfssharedqueryprocessor.md
index f92dcae23..6ce2b858f 100644
--- a/docs/collections/_reference/reference.processors.tfssharedqueryprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfssharedqueryprocessor.md
@@ -57,7 +57,7 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Queries
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsSharedQueryProcessorOptions.cs
 
 redirectFrom:
@@ -71,11 +71,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsSharedQueryProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsSharedQueryProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsSharedQueryProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsSharedQueryProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsteamsettingsprocessor.md b/docs/collections/_reference/reference.processors.tfsteamsettingsprocessor.md
index 537c0d1cf..5f70eda3b 100644
--- a/docs/collections/_reference/reference.processors.tfsteamsettingsprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsteamsettingsprocessor.md
@@ -72,7 +72,7 @@ options:
   defaultValue: missing XML code comments
 status: Beta
 processingTarget: Teams
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsTeamSettingsProcessorOptions.cs
 
 redirectFrom:
@@ -86,11 +86,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsTeamSettingsProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsTeamSettingsProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsTeamSettingsProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsTeamSettingsProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfstestconfigurationsmigrationprocessor.md b/docs/collections/_reference/reference.processors.tfstestconfigurationsmigrationprocessor.md
index 7ed4785c8..64d7bd734 100644
--- a/docs/collections/_reference/reference.processors.tfstestconfigurationsmigrationprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfstestconfigurationsmigrationprocessor.md
@@ -56,11 +56,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsTestConfigurationsMigrationProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsTestConfigurationsMigrationProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsTestConfigurationsMigrationProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsTestConfigurationsMigrationProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfstestplansandsuitesmigrationprocessor.md b/docs/collections/_reference/reference.processors.tfstestplansandsuitesmigrationprocessor.md
index 89d3bd026..29c362b46 100644
--- a/docs/collections/_reference/reference.processors.tfstestplansandsuitesmigrationprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfstestplansandsuitesmigrationprocessor.md
@@ -91,9 +91,9 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsTestPlansAndSuitesMigrationProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsTestPlansAndSuitesMigrationProcessor-notes.md
   exists: true
-  markdown: >+
+  markdown: >
     ## Additional Samples & Info
 
 
@@ -143,7 +143,7 @@ topics:
 
     ```
 - topic: introduction
-  path: /docs/Reference/Processors/TfsTestPlansAndSuitesMigrationProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsTestPlansAndSuitesMigrationProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfstestvariablesmigrationprocessor.md b/docs/collections/_reference/reference.processors.tfstestvariablesmigrationprocessor.md
index 16843b7f9..0b08b571a 100644
--- a/docs/collections/_reference/reference.processors.tfstestvariablesmigrationprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfstestvariablesmigrationprocessor.md
@@ -61,11 +61,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsTestVariablesMigrationProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsTestVariablesMigrationProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsTestVariablesMigrationProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsTestVariablesMigrationProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsworkitembulkeditprocessor.md b/docs/collections/_reference/reference.processors.tfsworkitembulkeditprocessor.md
index 4ec1fbbc4..b7e9339c9 100644
--- a/docs/collections/_reference/reference.processors.tfsworkitembulkeditprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsworkitembulkeditprocessor.md
@@ -86,11 +86,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsWorkItemBulkEditProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsWorkItemBulkEditProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsWorkItemBulkEditProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsWorkItemBulkEditProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsworkitemdeleteprocessor.md b/docs/collections/_reference/reference.processors.tfsworkitemdeleteprocessor.md
index 3f5dcf2cd..69031d910 100644
--- a/docs/collections/_reference/reference.processors.tfsworkitemdeleteprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsworkitemdeleteprocessor.md
@@ -67,7 +67,7 @@ options:
   defaultValue: missing XML code comments
 status: ready
 processingTarget: WorkItem
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemDeleteProcessorOptions.cs
 
 redirectFrom:
@@ -81,11 +81,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsWorkItemDeleteProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsWorkItemDeleteProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsWorkItemDeleteProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsWorkItemDeleteProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsworkitemmigrationprocessor.md b/docs/collections/_reference/reference.processors.tfsworkitemmigrationprocessor.md
index 22e5849a0..1f719b9a2 100644
--- a/docs/collections/_reference/reference.processors.tfsworkitemmigrationprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsworkitemmigrationprocessor.md
@@ -118,7 +118,7 @@ options:
   defaultValue: 5
 status: ready
 processingTarget: Work Items
-classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessor.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessorOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessorOptions.cs
 
 redirectFrom:
@@ -132,9 +132,9 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsWorkItemMigrationProcessor-notes.md
   exists: true
-  markdown: >+
+  markdown: >
     ## <a name="WIQLQuery"></a>WIQL Query
 
 
@@ -201,7 +201,7 @@ topics:
     Using the above sample structure, if you wanted to map the source project `Team 1` to target project `Team A` etc. you could add the field map as follows
 
 
-    A complete list of [FieldMaps](../Reference/FieldMaps/index.md) are available.
+    A complete list of [FieldMaps](../FieldMaps/index.md) are available.
 
 
     ```
@@ -231,9 +231,9 @@ topics:
 
     - PrefixProjectToNodes - This option was removed in favour of the Area and Iteration Maps on [TfsNodeStructure](/Reference/v2/ProcessorEnrichers/TfsNodeStructure/)
 - topic: introduction
-  path: /docs/Reference/Processors/TfsWorkItemMigrationProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsWorkItemMigrationProcessor-introduction.md
   exists: true
-  markdown: >+
+  markdown: >
     The `WorkItemMigrationContext` processor is used for migrating work items from one Azure DevOps instance to another. This encompasses a variety of activities:
 
 
diff --git a/docs/collections/_reference/reference.processors.tfsworkitemoverwriteareasastagsprocessor.md b/docs/collections/_reference/reference.processors.tfsworkitemoverwriteareasastagsprocessor.md
index 0effc1ccd..defe1bb71 100644
--- a/docs/collections/_reference/reference.processors.tfsworkitemoverwriteareasastagsprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsworkitemoverwriteareasastagsprocessor.md
@@ -61,11 +61,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsWorkItemOverwriteAreasAsTagsProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsWorkItemOverwriteAreasAsTagsProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsWorkItemOverwriteAreasAsTagsProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsWorkItemOverwriteAreasAsTagsProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.tfsworkitemoverwriteprocessor.md b/docs/collections/_reference/reference.processors.tfsworkitemoverwriteprocessor.md
index 1711b6f29..552b1213d 100644
--- a/docs/collections/_reference/reference.processors.tfsworkitemoverwriteprocessor.md
+++ b/docs/collections/_reference/reference.processors.tfsworkitemoverwriteprocessor.md
@@ -81,11 +81,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/TfsWorkItemOverwriteProcessor-notes.md
+  path: ../../docs/Reference/Processors/TfsWorkItemOverwriteProcessor-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Processors/TfsWorkItemOverwriteProcessor-introduction.md
+  path: ../../docs/Reference/Processors/TfsWorkItemOverwriteProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.processors.workitemtrackingprocessor.md b/docs/collections/_reference/reference.processors.workitemtrackingprocessor.md
index 656590e0f..72faad497 100644
--- a/docs/collections/_reference/reference.processors.workitemtrackingprocessor.md
+++ b/docs/collections/_reference/reference.processors.workitemtrackingprocessor.md
@@ -57,7 +57,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Processors/WorkItemTrackingProcessor.cs
+classFile: src/MigrationTools/Processors/WorkItemTrackingProcessorOptions.cs
 optionsClassFile: src/MigrationTools/Processors/WorkItemTrackingProcessorOptions.cs
 
 redirectFrom:
@@ -71,9 +71,9 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Processors/WorkItemTrackingProcessor-notes.md
+  path: ../../docs/Reference/Processors/WorkItemTrackingProcessor-notes.md
   exists: true
-  markdown: >2+
+  markdown: >2
 
     ### Supported Endpoints
 
@@ -194,7 +194,7 @@ topics:
         }
     ```
 - topic: introduction
-  path: /docs/Reference/Processors/WorkItemTrackingProcessor-introduction.md
+  path: ../../docs/Reference/Processors/WorkItemTrackingProcessor-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.fieldmappingtool.md b/docs/collections/_reference/reference.tools.fieldmappingtool.md
index d04d112c7..823af7d4f 100644
--- a/docs/collections/_reference/reference.tools.fieldmappingtool.md
+++ b/docs/collections/_reference/reference.tools.fieldmappingtool.md
@@ -216,7 +216,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Tools/FieldMappingTool.cs
+classFile: src/MigrationTools/Tools/FieldMappingToolOptions.cs
 optionsClassFile: src/MigrationTools/Tools/FieldMappingToolOptions.cs
 
 redirectFrom:
@@ -230,11 +230,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/FieldMappingTool-notes.md
+  path: ../../docs/Reference/Tools/FieldMappingTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/FieldMappingTool-introduction.md
+  path: ../../docs/Reference/Tools/FieldMappingTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.stringmanipulatortool.md b/docs/collections/_reference/reference.tools.stringmanipulatortool.md
index a41a72ed7..4037010b6 100644
--- a/docs/collections/_reference/reference.tools.stringmanipulatortool.md
+++ b/docs/collections/_reference/reference.tools.stringmanipulatortool.md
@@ -95,11 +95,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/StringManipulatorTool-notes.md
+  path: ../../docs/Reference/Tools/StringManipulatorTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/StringManipulatorTool-introduction.md
+  path: ../../docs/Reference/Tools/StringManipulatorTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsattachmenttool.md b/docs/collections/_reference/reference.tools.tfsattachmenttool.md
index a24111c50..882bb5117 100644
--- a/docs/collections/_reference/reference.tools.tfsattachmenttool.md
+++ b/docs/collections/_reference/reference.tools.tfsattachmenttool.md
@@ -68,7 +68,7 @@ options:
   defaultValue: 480000000
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsAttachmentToolOptions.cs
 
 redirectFrom:
@@ -82,11 +82,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsAttachmentTool-notes.md
+  path: ../../docs/Reference/Tools/TfsAttachmentTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsAttachmentTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsAttachmentTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfschangesetmappingtool.md b/docs/collections/_reference/reference.tools.tfschangesetmappingtool.md
index eca3bc9c4..1162d3716 100644
--- a/docs/collections/_reference/reference.tools.tfschangesetmappingtool.md
+++ b/docs/collections/_reference/reference.tools.tfschangesetmappingtool.md
@@ -73,11 +73,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsChangeSetMappingTool-notes.md
+  path: ../../docs/Reference/Tools/TfsChangeSetMappingTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsChangeSetMappingTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsChangeSetMappingTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsembededimagestool.md b/docs/collections/_reference/reference.tools.tfsembededimagestool.md
index 537fcd444..9f482d141 100644
--- a/docs/collections/_reference/reference.tools.tfsembededimagestool.md
+++ b/docs/collections/_reference/reference.tools.tfsembededimagestool.md
@@ -66,11 +66,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsEmbededImagesTool-notes.md
+  path: ../../docs/Reference/Tools/TfsEmbededImagesTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsEmbededImagesTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsEmbededImagesTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsgitrepositorytool.md b/docs/collections/_reference/reference.tools.tfsgitrepositorytool.md
index aae863097..486fe413e 100644
--- a/docs/collections/_reference/reference.tools.tfsgitrepositorytool.md
+++ b/docs/collections/_reference/reference.tools.tfsgitrepositorytool.md
@@ -68,7 +68,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsGitRepositoryToolOptions.cs
 
 redirectFrom:
@@ -82,11 +82,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsGitRepositoryTool-notes.md
+  path: ../../docs/Reference/Tools/TfsGitRepositoryTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsGitRepositoryTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsGitRepositoryTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsnodestructuretool.md b/docs/collections/_reference/reference.tools.tfsnodestructuretool.md
index 8c930b4f3..e09ffab04 100644
--- a/docs/collections/_reference/reference.tools.tfsnodestructuretool.md
+++ b/docs/collections/_reference/reference.tools.tfsnodestructuretool.md
@@ -138,9 +138,9 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsNodeStructureTool-notes.md
+  path: ../../docs/Reference/Tools/TfsNodeStructureTool-notes.md
   exists: true
-  markdown: >+
+  markdown: >
     ## Iteration Maps and Area Maps
 
 
@@ -524,7 +524,7 @@ topics:
 
     You can also use negation when doing this.
 - topic: introduction
-  path: /docs/Reference/Tools/TfsNodeStructureTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsNodeStructureTool-introduction.md
   exists: true
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsrevisionmanagertool.md b/docs/collections/_reference/reference.tools.tfsrevisionmanagertool.md
index 9187713cf..fa7437c7b 100644
--- a/docs/collections/_reference/reference.tools.tfsrevisionmanagertool.md
+++ b/docs/collections/_reference/reference.tools.tfsrevisionmanagertool.md
@@ -80,11 +80,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsRevisionManagerTool-notes.md
+  path: ../../docs/Reference/Tools/TfsRevisionManagerTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsRevisionManagerTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsRevisionManagerTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsteamsettingstool.md b/docs/collections/_reference/reference.tools.tfsteamsettingstool.md
index ba7065c19..4ed13f554 100644
--- a/docs/collections/_reference/reference.tools.tfsteamsettingstool.md
+++ b/docs/collections/_reference/reference.tools.tfsteamsettingstool.md
@@ -91,7 +91,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsTeamSettingsToolOptions.cs
 
 redirectFrom:
@@ -105,11 +105,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsTeamSettingsTool-notes.md
+  path: ../../docs/Reference/Tools/TfsTeamSettingsTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsTeamSettingsTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsTeamSettingsTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsusermappingtool.md b/docs/collections/_reference/reference.tools.tfsusermappingtool.md
index aa8ac43c4..551ca0171 100644
--- a/docs/collections/_reference/reference.tools.tfsusermappingtool.md
+++ b/docs/collections/_reference/reference.tools.tfsusermappingtool.md
@@ -98,7 +98,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingToolOptions.cs
 
 redirectFrom:
@@ -112,11 +112,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsUserMappingTool-notes.md
+  path: ../../docs/Reference/Tools/TfsUserMappingTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsUserMappingTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsUserMappingTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsvalidaterequiredfieldtool.md b/docs/collections/_reference/reference.tools.tfsvalidaterequiredfieldtool.md
index 8be1d453d..ada288dd2 100644
--- a/docs/collections/_reference/reference.tools.tfsvalidaterequiredfieldtool.md
+++ b/docs/collections/_reference/reference.tools.tfsvalidaterequiredfieldtool.md
@@ -46,11 +46,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsValidateRequiredFieldTool-notes.md
+  path: ../../docs/Reference/Tools/TfsValidateRequiredFieldTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsValidateRequiredFieldTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsValidateRequiredFieldTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsworkitemembededlinktool.md b/docs/collections/_reference/reference.tools.tfsworkitemembededlinktool.md
index 5c4b4676a..092e03ac0 100644
--- a/docs/collections/_reference/reference.tools.tfsworkitemembededlinktool.md
+++ b/docs/collections/_reference/reference.tools.tfsworkitemembededlinktool.md
@@ -52,7 +52,7 @@ options:
   defaultValue: missing XML code comments
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkTool.cs
+classFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkToolOptions.cs
 optionsClassFile: src/MigrationTools.Clients.TfsObjectModel/Tools/TfsWorkItemEmbededLinkToolOptions.cs
 
 redirectFrom:
@@ -66,11 +66,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsWorkItemEmbededLinkTool-notes.md
+  path: ../../docs/Reference/Tools/TfsWorkItemEmbededLinkTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsWorkItemEmbededLinkTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsWorkItemEmbededLinkTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.tfsworkitemlinktool.md b/docs/collections/_reference/reference.tools.tfsworkitemlinktool.md
index c5b50f34f..348e40072 100644
--- a/docs/collections/_reference/reference.tools.tfsworkitemlinktool.md
+++ b/docs/collections/_reference/reference.tools.tfsworkitemlinktool.md
@@ -80,11 +80,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/TfsWorkItemLinkTool-notes.md
+  path: ../../docs/Reference/Tools/TfsWorkItemLinkTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/TfsWorkItemLinkTool-introduction.md
+  path: ../../docs/Reference/Tools/TfsWorkItemLinkTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/docs/collections/_reference/reference.tools.workitemtypemappingtool.md b/docs/collections/_reference/reference.tools.workitemtypemappingtool.md
index ebded1866..9feec5ad8 100644
--- a/docs/collections/_reference/reference.tools.workitemtypemappingtool.md
+++ b/docs/collections/_reference/reference.tools.workitemtypemappingtool.md
@@ -66,7 +66,7 @@ options:
   defaultValue: '{}'
 status: missing XML code comments
 processingTarget: missing XML code comments
-classFile: src/MigrationTools/Tools/WorkItemTypeMappingTool.cs
+classFile: src/MigrationTools/Tools/WorkItemTypeMappingToolOptions.cs
 optionsClassFile: src/MigrationTools/Tools/WorkItemTypeMappingToolOptions.cs
 
 redirectFrom:
@@ -80,11 +80,11 @@ categories:
 - 
 topics:
 - topic: notes
-  path: /docs/Reference/Tools/WorkItemTypeMappingTool-notes.md
+  path: ../../docs/Reference/Tools/WorkItemTypeMappingTool-notes.md
   exists: false
   markdown: ''
 - topic: introduction
-  path: /docs/Reference/Tools/WorkItemTypeMappingTool-introduction.md
+  path: ../../docs/Reference/Tools/WorkItemTypeMappingTool-introduction.md
   exists: false
   markdown: ''
 
diff --git a/src/MigrationTools.ConsoleDataGenerator/MarkdownLoader.cs b/src/MigrationTools.ConsoleDataGenerator/MarkdownLoader.cs
index ca9b1a02b..5a3460d86 100644
--- a/src/MigrationTools.ConsoleDataGenerator/MarkdownLoader.cs
+++ b/src/MigrationTools.ConsoleDataGenerator/MarkdownLoader.cs
@@ -11,7 +11,7 @@ namespace MigrationTools.ConsoleDataGenerator
 
     public class MarkdownLoader
     {
-        private string markdownPath = "../../../../../docs/Reference/";
+        private string markdownPath = "../../docs/Reference/";
 
         public MarkdownLoader()
         {
diff --git a/src/MigrationTools.ConsoleDataGenerator/Program.cs b/src/MigrationTools.ConsoleDataGenerator/Program.cs
index 5edfaa68e..0c18ba79a 100644
--- a/src/MigrationTools.ConsoleDataGenerator/Program.cs
+++ b/src/MigrationTools.ConsoleDataGenerator/Program.cs
@@ -11,8 +11,8 @@ namespace MigrationTools.ConsoleDataGenerator;
 class Program
 {
     private static IConfiguration configuration = GetConfiguration();
-    private static DataSerialization saveData = new DataSerialization("../../../../../");
-    private static ClassDataLoader cdLoader = new ClassDataLoader("../../../../../", saveData, configuration);
+    private static DataSerialization saveData = new DataSerialization("../../");
+    private static ClassDataLoader cdLoader = new ClassDataLoader("../../", saveData, configuration);
     private static MarkdownLoader mdLoader = new MarkdownLoader();