diff --git a/src/AtomUI.Controls/AtomUI.Controls.csproj b/src/AtomUI.Controls/AtomUI.Controls.csproj
index fad9730cd..70de2fa03 100644
--- a/src/AtomUI.Controls/AtomUI.Controls.csproj
+++ b/src/AtomUI.Controls/AtomUI.Controls.csproj
@@ -36,4 +36,8 @@
       <AdditionalFiles Include="Buttons\Themes\Button\TextButtonTheme.axaml" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Internal\" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/AtomUI.Controls/DatePicker/DatePicker.cs b/src/AtomUI.Controls/DatePicker/DatePicker.cs
index b5586aab7..ed7db55d9 100644
--- a/src/AtomUI.Controls/DatePicker/DatePicker.cs
+++ b/src/AtomUI.Controls/DatePicker/DatePicker.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 using AtomUI.Controls.CalendarView;
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.Controls.TimePickerLang;
 using AtomUI.Data;
 using AtomUI.Media;
diff --git a/src/AtomUI.Controls/DatePicker/DatePickerTheme.cs b/src/AtomUI.Controls/DatePicker/DatePickerTheme.cs
index b9545b224..23490afd9 100644
--- a/src/AtomUI.Controls/DatePicker/DatePickerTheme.cs
+++ b/src/AtomUI.Controls/DatePicker/DatePickerTheme.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.IconPkg;
 using AtomUI.IconPkg.AntDesign;
 using AtomUI.Theme.Styling;
diff --git a/src/AtomUI.Controls/DatePicker/RangeDatePicker.cs b/src/AtomUI.Controls/DatePicker/RangeDatePicker.cs
index 606546ce4..9549e3f9d 100644
--- a/src/AtomUI.Controls/DatePicker/RangeDatePicker.cs
+++ b/src/AtomUI.Controls/DatePicker/RangeDatePicker.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 using AtomUI.Controls.CalendarView;
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.Controls.TimePickerLang;
 using AtomUI.Data;
 using AtomUI.Media;
@@ -9,7 +9,6 @@ using AtomUI.Theme.Data;
 using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
diff --git a/src/AtomUI.Controls/DatePicker/RangeDatePickerTheme.cs b/src/AtomUI.Controls/DatePicker/RangeDatePickerTheme.cs
index 80af49022..6b6b7c7c2 100644
--- a/src/AtomUI.Controls/DatePicker/RangeDatePickerTheme.cs
+++ b/src/AtomUI.Controls/DatePicker/RangeDatePickerTheme.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.IconPkg;
 using AtomUI.IconPkg.AntDesign;
 using AtomUI.Theme.Styling;
diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs
index 1bcc2a5c9..88cf43b2d 100644
--- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs
+++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs
@@ -46,7 +46,6 @@ namespace AtomUI.Theme
             themes.Add(new AtomUI.Controls.HorizontalNavMenuTheme());
             themes.Add(new AtomUI.Controls.HyperLinkTextBlockTheme());
             themes.Add(new AtomUI.Controls.InlineNavMenuItemTheme());
-            themes.Add(new AtomUI.Controls.Internal.RangeInfoPickerInputTheme());
             themes.Add(new AtomUI.Controls.ListBoxItemTheme());
             themes.Add(new AtomUI.Controls.ListBoxTheme());
             themes.Add(new AtomUI.Controls.LoadingIndicatorAdornerTheme());
@@ -63,11 +62,11 @@ namespace AtomUI.Theme
             themes.Add(new AtomUI.Controls.OptionButtonGroupTheme());
             themes.Add(new AtomUI.Controls.OptionButtonTheme());
             themes.Add(new AtomUI.Controls.PickerClearUpButtonTheme());
+            themes.Add(new AtomUI.Controls.Primitives.RangeInfoPickerInputTheme());
             themes.Add(new AtomUI.Controls.ProgressBarTheme());
             themes.Add(new AtomUI.Controls.RangeDatePickerFlyoutPresenterTheme());
             themes.Add(new AtomUI.Controls.RangeDatePickerTheme());
             themes.Add(new AtomUI.Controls.RangeTimePickerTheme());
-            themes.Add(new AtomUI.Controls.SearchEditTheme());
             themes.Add(new AtomUI.Controls.SegmentedItemTheme());
             themes.Add(new AtomUI.Controls.SegmentedTheme());
             themes.Add(new AtomUI.Controls.SeparatorTheme());
diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs
index 702e4e9b3..11ec075fb 100644
--- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs
+++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs
@@ -25,7 +25,6 @@ namespace AtomUI.Theme
             tokenTypes.Add(typeof(AtomUI.Controls.ExpanderToken));
             tokenTypes.Add(typeof(AtomUI.Controls.FlyoutPresenterToken));
             tokenTypes.Add(typeof(AtomUI.Controls.GroupBoxToken));
-            tokenTypes.Add(typeof(AtomUI.Controls.Internal.InfoPickerInputToken));
             tokenTypes.Add(typeof(AtomUI.Controls.LineEditToken));
             tokenTypes.Add(typeof(AtomUI.Controls.ListBoxToken));
             tokenTypes.Add(typeof(AtomUI.Controls.LoadingIndicatorToken));
@@ -38,6 +37,7 @@ namespace AtomUI.Theme
             tokenTypes.Add(typeof(AtomUI.Controls.OptionButtonToken));
             tokenTypes.Add(typeof(AtomUI.Controls.PaginationToken));
             tokenTypes.Add(typeof(AtomUI.Controls.PopupConfirmToken));
+            tokenTypes.Add(typeof(AtomUI.Controls.Primitives.InfoPickerInputToken));
             tokenTypes.Add(typeof(AtomUI.Controls.ProgressBarToken));
             tokenTypes.Add(typeof(AtomUI.Controls.RadioButtonToken));
             tokenTypes.Add(typeof(AtomUI.Controls.ScrollBarToken));
diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs
index 71aecdb26..5acaac08f 100644
--- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs
+++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs
@@ -294,12 +294,6 @@ namespace AtomUI.Theme.Styling
         public static readonly TokenResourceKey WarningActiveShadow = new TokenResourceKey("LineEdit.WarningActiveShadow");
     }
 
-    public static class InfoPickerInputTokenKey
-    {
-        public static readonly TokenResourceKey RangePickerArrowMargin = new TokenResourceKey("InfoPickerInput.RangePickerArrowMargin");
-        public static readonly TokenResourceKey RangePickerIndicatorThickness = new TokenResourceKey("InfoPickerInput.RangePickerIndicatorThickness");
-    }
-
     public static class ListBoxTokenKey
     {
         public static readonly TokenResourceKey ContentPadding = new TokenResourceKey("ListBox.ContentPadding");
@@ -533,6 +527,12 @@ namespace AtomUI.Theme.Styling
         public static readonly TokenResourceKey TitleMargin = new TokenResourceKey("PopupConfirm.TitleMargin");
     }
 
+    public static class InfoPickerInputTokenKey
+    {
+        public static readonly TokenResourceKey RangePickerArrowMargin = new TokenResourceKey("InfoPickerInput.RangePickerArrowMargin");
+        public static readonly TokenResourceKey RangePickerIndicatorThickness = new TokenResourceKey("InfoPickerInput.RangePickerIndicatorThickness");
+    }
+
     public static class ProgressBarTokenKey
     {
         public static readonly TokenResourceKey CircleMinimumIconSize = new TokenResourceKey("ProgressBar.CircleMinimumIconSize");
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs
similarity index 99%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs
index bb0a7807c..ac6244199 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs
+++ b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs
@@ -11,7 +11,7 @@ using Avalonia.Input.Raw;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 
-namespace AtomUI.Controls.Internal;
+namespace AtomUI.Controls.Primitives;
 
 [PseudoClasses(FlyoutOpenPC)]
 public abstract class InfoPickerInput : TemplatedControl,
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputTheme.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputTheme.cs
similarity index 99%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputTheme.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputTheme.cs
index f5a0fdeed..93f402290 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputTheme.cs
+++ b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputTheme.cs
@@ -8,7 +8,7 @@ using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Styling;
 
-namespace AtomUI.Controls.Internal;
+namespace AtomUI.Controls.Primitives;
 
 internal class InfoPickerInputTheme : BaseControlTheme
 {
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputToken.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputToken.cs
similarity index 95%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputToken.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputToken.cs
index 4e6c22cb8..2bf523077 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInputToken.cs
+++ b/src/AtomUI.Controls/Primitives/InfoPickerInput/InfoPickerInputToken.cs
@@ -1,7 +1,7 @@
 using AtomUI.Theme.TokenSystem;
 using Avalonia;
 
-namespace AtomUI.Controls.Internal;
+namespace AtomUI.Controls.Primitives;
 
 [ControlDesignToken]
 internal class InfoPickerInputToken : AbstractControlDesignToken
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButton.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButton.cs
similarity index 100%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButton.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButton.cs
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButtonTheme.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButtonTheme.cs
similarity index 100%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/PickerClearUpButtonTheme.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/PickerClearUpButtonTheme.cs
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInput.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInput.cs
similarity index 99%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInput.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInput.cs
index 83d9cb6e0..f1649e73b 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInput.cs
+++ b/src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInput.cs
@@ -9,7 +9,7 @@ using Avalonia.Controls.Shapes;
 using Avalonia.Input.Raw;
 using Avalonia.VisualTree;
 
-namespace AtomUI.Controls.Internal;
+namespace AtomUI.Controls.Primitives;
 
 public abstract class RangeInfoPickerInput : InfoPickerInput
 {
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInputTheme.cs b/src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInputTheme.cs
similarity index 99%
rename from src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInputTheme.cs
rename to src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInputTheme.cs
index 8085cc691..fceb87d22 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/RangeInfoPickerInputTheme.cs
+++ b/src/AtomUI.Controls/Primitives/InfoPickerInput/RangeInfoPickerInputTheme.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Layout;
 using Avalonia.Styling;
 
-namespace AtomUI.Controls.Internal;
+namespace AtomUI.Controls.Primitives;
 
 [ControlThemeProvider]
 internal class RangeInfoPickerInputTheme : InfoPickerInputTheme
diff --git a/src/AtomUI.Controls/TimePicker/RangeTimePicker.cs b/src/AtomUI.Controls/TimePicker/RangeTimePicker.cs
index bacb1123e..a7c91f46c 100644
--- a/src/AtomUI.Controls/TimePicker/RangeTimePicker.cs
+++ b/src/AtomUI.Controls/TimePicker/RangeTimePicker.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.Controls.Utils;
 using AtomUI.Data;
 using AtomUI.Media;
@@ -6,7 +6,6 @@ using AtomUI.Theme;
 using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
diff --git a/src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs b/src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs
index 3498a625b..b7ca14ce6 100644
--- a/src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs
+++ b/src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.IconPkg;
 using AtomUI.IconPkg.AntDesign;
 using AtomUI.Theme.Styling;
diff --git a/src/AtomUI.Controls/TimePicker/TimePicker.cs b/src/AtomUI.Controls/TimePicker/TimePicker.cs
index 457884c45..5e54e3546 100644
--- a/src/AtomUI.Controls/TimePicker/TimePicker.cs
+++ b/src/AtomUI.Controls/TimePicker/TimePicker.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.Controls.Utils;
 using AtomUI.Data;
 using AtomUI.Media;
@@ -6,7 +6,6 @@ using AtomUI.Theme;
 using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
 
 namespace AtomUI.Controls;
diff --git a/src/AtomUI.Controls/TimePicker/TimePickerTheme.cs b/src/AtomUI.Controls/TimePicker/TimePickerTheme.cs
index 555e39e1e..64c5bf7f7 100644
--- a/src/AtomUI.Controls/TimePicker/TimePickerTheme.cs
+++ b/src/AtomUI.Controls/TimePicker/TimePickerTheme.cs
@@ -1,4 +1,4 @@
-using AtomUI.Controls.Internal;
+using AtomUI.Controls.Primitives;
 using AtomUI.IconPkg;
 using AtomUI.IconPkg.AntDesign;
 using AtomUI.Theme.Styling;