diff --git a/src/Atata/Components/LinkTarget.cs b/src/Atata/Components/Fields/Content/LinkTarget.cs
similarity index 100%
rename from src/Atata/Components/LinkTarget.cs
rename to src/Atata/Components/Fields/Content/LinkTarget.cs
diff --git a/src/Atata/Components/Link`1.cs b/src/Atata/Components/Fields/Content/Link`1.cs
similarity index 100%
rename from src/Atata/Components/Link`1.cs
rename to src/Atata/Components/Fields/Content/Link`1.cs
diff --git a/src/Atata/Components/Link`2.cs b/src/Atata/Components/Fields/Content/Link`2.cs
similarity index 100%
rename from src/Atata/Components/Link`2.cs
rename to src/Atata/Components/Fields/Content/Link`2.cs
diff --git a/src/Atata/Components/TextListItem`1.cs b/src/Atata/Components/Fields/Content/TextListItem`1.cs
similarity index 100%
rename from src/Atata/Components/TextListItem`1.cs
rename to src/Atata/Components/Fields/Content/TextListItem`1.cs
diff --git a/src/Atata/Components/TableRow`1.cs b/src/Atata/Components/TableRow`1.cs
index eef56d503..6efc2c032 100644
--- a/src/Atata/Components/TableRow`1.cs
+++ b/src/Atata/Components/TableRow`1.cs
@@ -9,7 +9,9 @@ namespace Atata
     /// </summary>
     /// <typeparam name="TOwner">The type of the owner page object.</typeparam>
     [ControlDefinition("tr[parent::table or parent::tbody]", ComponentTypeName = "row")]
-    [FindByColumnHeader(TargetType = typeof(Content<,>))]
+    [FindByColumnHeader(
+        TargetType = typeof(Content<,>),
+        ExcludeTargetTypes = new[] { typeof(Link<>), typeof(Label<,>), typeof(TextListItem<>) })]
     public class TableRow<TOwner> : Control<TOwner>
         where TOwner : PageObject<TOwner>
     {