diff --git a/samples/BehaviorsTestApplication/Controls/EditableItem.axaml b/samples/BehaviorsTestApplication/Controls/EditableItem.axaml
index 2ed98c25..6d852f25 100644
--- a/samples/BehaviorsTestApplication/Controls/EditableItem.axaml
+++ b/samples/BehaviorsTestApplication/Controls/EditableItem.axaml
@@ -23,7 +23,7 @@
         <HideOnKeyPressedBehavior TargetControl="TextBoxEdit" Key="Escape" />
         <HideOnKeyPressedBehavior TargetControl="TextBoxEdit" Key="Enter" />
         <HideOnLostFocusBehavior TargetControl="TextBoxEdit" />
-        <SelectAllOnGotFocusBehavior />
+        <TextBoxSelectAllOnGotFocusBehavior />
       </Interaction.Behaviors>
     </TextBox>
     <StackPanel x:Name="TextStackPanel"
diff --git a/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs
index 218d7833..52aea4f2 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/BindTagToVisualRootDataContextBehavior.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// <summary>
 /// Binds AssociatedObject object Tag property to root visual DataContext.
 /// </summary>
-public class BindTagToVisualRootDataContextBehavior : DisposingBehavior<ContentControl>
+public class BindTagToVisualRootDataContextBehavior : DisposingBehavior<Control>
 {
     /// <summary>
     /// 
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ButtonClickEventTriggerBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonClickEventTriggerBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ButtonClickEventTriggerBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/Button/ButtonClickEventTriggerBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ButtonExecuteCommandOnKeyDownBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonExecuteCommandOnKeyDownBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ButtonExecuteCommandOnKeyDownBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/Button/ButtonExecuteCommandOnKeyDownBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutBehavior.cs
similarity index 88%
rename from src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutBehavior.cs
index c3547fd9..a30d9a4b 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutBehavior.cs
@@ -7,13 +7,13 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// <summary>
 /// 
 /// </summary>
-public class HideButtonFlyoutBehavior : DisposingBehavior<Button>
+public class ButtonHideFlyoutBehavior : DisposingBehavior<Button>
 {
     /// <summary>
     /// 
     /// </summary>
     public static readonly StyledProperty<bool> IsFlyoutOpenProperty =
-        AvaloniaProperty.Register<HideButtonFlyoutBehavior, bool>(nameof(IsFlyoutOpen));
+        AvaloniaProperty.Register<ButtonHideFlyoutBehavior, bool>(nameof(IsFlyoutOpen));
 
     /// <summary>
     /// 
diff --git a/src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutOnClickBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutOnClickBehavior.cs
similarity index 95%
rename from src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutOnClickBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutOnClickBehavior.cs
index d9d14506..3535fb32 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/HideButtonFlyoutOnClickBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/Button/ButtonHideFlyoutOnClickBehavior.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// <summary>
 /// 
 /// </summary>
-public class HideButtonFlyoutOnClickBehavior : AttachedToVisualTreeBehavior<Button>
+public class ButtonHideFlyoutOnClickBehavior : AttachedToVisualTreeBehavior<Button>
 {
     /// <summary>
     /// 
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ValueChangedTriggerBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/Core/ValueChangedTriggerBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ValueChangedTriggerBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/Core/ValueChangedTriggerBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/HideAttachedFlyoutBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/HideAttachedFlyoutBehavior.cs
index 009a8d4e..43ddb055 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/HideAttachedFlyoutBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/HideAttachedFlyoutBehavior.cs
@@ -14,7 +14,7 @@ public class HideAttachedFlyoutBehavior : DisposingBehavior<Control>
     /// 
     /// </summary>
     public static readonly StyledProperty<bool> IsFlyoutOpenProperty =
-        AvaloniaProperty.Register<HideButtonFlyoutBehavior, bool>(nameof(IsFlyoutOpen));
+        AvaloniaProperty.Register<ButtonHideFlyoutBehavior, bool>(nameof(IsFlyoutOpen));
 
     /// <summary>
     /// 
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ScrollToItemBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ScrollToItemBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ScrollToItemBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ScrollToItemBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ScrollToItemIndexBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ScrollToItemIndexBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ScrollToItemIndexBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ScrollToItemIndexBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/SelectListBoxItemOnPointerMovedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ListBoxItem/SelectListBoxItemOnPointerMovedBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/SelectListBoxItemOnPointerMovedBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/ListBoxItem/SelectListBoxItemOnPointerMovedBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/HorizontalScrollViewerBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ScrollViewer/HorizontalScrollViewerBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/HorizontalScrollViewerBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/ScrollViewer/HorizontalScrollViewerBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/SelectAllOnGotFocusBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/TextBox/TextBoxSelectAllOnGotFocusBehavior.cs
similarity index 92%
rename from src/Avalonia.Xaml.Interactions.Custom/SelectAllOnGotFocusBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/TextBox/TextBoxSelectAllOnGotFocusBehavior.cs
index 1c39ec26..d7a49384 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/SelectAllOnGotFocusBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/TextBox/TextBoxSelectAllOnGotFocusBehavior.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Xaml.Interactions.Custom;
 /// <summary>
 /// A behavior that allows to select all <see cref="TextBox"/> text on got focus event.
 /// </summary>
-public class SelectAllOnGotFocusBehavior : Behavior<TextBox>
+public class TextBoxSelectAllOnGotFocusBehavior : Behavior<TextBox>
 {
     /// <inheritdoc />
     protected override void OnAttachedToVisualTree()
diff --git a/src/Avalonia.Xaml.Interactions.Custom/TextBoxSelectAllTextBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/TextBox/TextBoxSelectAllTextBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/TextBoxSelectAllTextBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/TextBox/TextBoxSelectAllTextBehavior.cs
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ToggleIsExpandedOnDoubleTappedBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/TreeViewItem/ToggleIsExpandedOnDoubleTappedBehavior.cs
similarity index 100%
rename from src/Avalonia.Xaml.Interactions.Custom/ToggleIsExpandedOnDoubleTappedBehavior.cs
rename to src/Avalonia.Xaml.Interactions.Custom/TreeViewItem/ToggleIsExpandedOnDoubleTappedBehavior.cs