diff --git a/MultiTerm.Wpf.CustomControl/ExtendedTabControl.cs b/MultiTerm.Wpf.CustomControl/ExtendedTabControl/ExtendedTabControl.cs
similarity index 100%
rename from MultiTerm.Wpf.CustomControl/ExtendedTabControl.cs
rename to MultiTerm.Wpf.CustomControl/ExtendedTabControl/ExtendedTabControl.cs
diff --git a/MultiTerm.Wpf.CustomControl/Themes/ExtendedTabControl.xaml b/MultiTerm.Wpf.CustomControl/ExtendedTabControl/ExtendedTabControl.xaml
similarity index 95%
rename from MultiTerm.Wpf.CustomControl/Themes/ExtendedTabControl.xaml
rename to MultiTerm.Wpf.CustomControl/ExtendedTabControl/ExtendedTabControl.xaml
index 2623823..174f86a 100644
--- a/MultiTerm.Wpf.CustomControl/Themes/ExtendedTabControl.xaml
+++ b/MultiTerm.Wpf.CustomControl/ExtendedTabControl/ExtendedTabControl.xaml
@@ -1,8 +1,7 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:MultiTerm.Wpf.CustomControl">
-
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:MultiTerm.Wpf.CustomControl">
+    
     <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
     <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
     <Style x:Key="TabControlStyle1" TargetType="{x:Type local:ExtendedTabControl}">
@@ -68,4 +67,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file