diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldClearMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldClearMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldClearMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldClearMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldLiteralMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldLiteralMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldLiteralMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldLiteralMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldMapBase.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldMapBase.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldMapBase.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldMapBase.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldMergeMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldMergeMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldMergeMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldMergeMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldSkipMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldSkipMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldSkipMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldSkipMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldToFieldMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToFieldMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldToFieldMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToFieldMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldToTagFieldMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToTagFieldMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldToTagFieldMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldToTagFieldMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldValueMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldValueMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldValueMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldValueMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldValuetoTagMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldValuetoTagMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldValuetoTagMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldValuetoTagMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldtoFieldMultiMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/FieldtoFieldMultiMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/FieldtoFieldMultiMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/MultiValueConditionalMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/MultiValueConditionalMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/MultiValueConditionalMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/MultiValueConditionalMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/NodePathNotAnchoredException.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/NodePathNotAnchoredException.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/NodePathNotAnchoredException.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/NodePathNotAnchoredException.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/RegexFieldMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/RegexFieldMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/RegexFieldMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/RegexFieldMap.cs
diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/TreeToTagFieldMap.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/TreeToTagFieldMap.cs
similarity index 100%
rename from src/MigrationTools.Clients.AzureDevops.ObjectModel/FieldMaps/TreeToTagFieldMap.cs
rename to src/MigrationTools.Clients.AzureDevops.ObjectModel/Tools/FieldMappingTool/FieldMaps/TreeToTagFieldMap.cs