diff --git a/src/AntiDupl.NET.Core/External.cmd b/src/AntiDupl.NET.Core/External.cmd
index 77d32bef..12a8d4e7 100644
--- a/src/AntiDupl.NET.Core/External.cmd
+++ b/src/AntiDupl.NET.Core/External.cmd
@@ -48,7 +48,7 @@ echo *>>%EXTERNAL_FILE%
 echo * Do not change this file because the file is auto generated by script External.cmd.>>%EXTERNAL_FILE%
 echo */>>%EXTERNAL_FILE%
 echo.>>%EXTERNAL_FILE%
-echo namespace AntiDupl.NET>>%EXTERNAL_FILE%
+echo namespace AntiDupl.NET.Core>>%EXTERNAL_FILE%
 echo {>>%EXTERNAL_FILE%
 echo     static public class External>>%EXTERNAL_FILE%
 echo     {>>%EXTERNAL_FILE%
diff --git a/src/AntiDupl.NET.Core/Version.cs b/src/AntiDupl.NET.Core/Version.cs
index 3e42ec2c..3e5f743b 100644
--- a/src/AntiDupl.NET.Core/Version.cs
+++ b/src/AntiDupl.NET.Core/Version.cs
@@ -28,9 +28,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-using AntiDupl.NET.Core;
-
-namespace AntiDupl.NET
+namespace AntiDupl.NET.Core
 {
     public class Version
     {
diff --git a/src/AntiDupl.NET.WPF/AntiDuplWPF.csproj b/src/AntiDupl.NET.WPF/AntiDupl.NET.WPF.csproj
similarity index 99%
rename from src/AntiDupl.NET.WPF/AntiDuplWPF.csproj
rename to src/AntiDupl.NET.WPF/AntiDupl.NET.WPF.csproj
index 6e8b90a4..c92172f4 100644
--- a/src/AntiDupl.NET.WPF/AntiDuplWPF.csproj
+++ b/src/AntiDupl.NET.WPF/AntiDupl.NET.WPF.csproj
@@ -26,7 +26,7 @@
 	<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>AntiDuplWPF.App</StartupObject>
+    <StartupObject>AntiDupl.NET.WPF.App</StartupObject>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/src/AntiDupl.NET.WPF/App.xaml b/src/AntiDupl.NET.WPF/App.xaml
index 658e34ac..1cea13f8 100644
--- a/src/AntiDupl.NET.WPF/App.xaml
+++ b/src/AntiDupl.NET.WPF/App.xaml
@@ -1,13 +1,12 @@
-<Application x:Class="AntiDuplWPF.App"
+<Application x:Class="AntiDupl.NET.WPF.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Style\Default.xaml" />
-                <!--<ResourceDictionary Source="pack://application:,,,/AntiDuplWPF;component/Style/Default.xaml"/>-->
-                <ResourceDictionary Source="/AntiDuplWPF;component/Control/SearchControlTheme.xaml" />
-                <ResourceDictionary Source="/AntiDuplWPF;component/Resources/lang.xaml" />
+                <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Control/SearchControlTheme.xaml" />
+                <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Resources/lang.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/AntiDupl.NET.WPF/App.xaml.cs b/src/AntiDupl.NET.WPF/App.xaml.cs
index 21b378b6..b9fedc5c 100644
--- a/src/AntiDupl.NET.WPF/App.xaml.cs
+++ b/src/AntiDupl.NET.WPF/App.xaml.cs
@@ -1,17 +1,17 @@
 using System;
 using System.ComponentModel;
 using System.Windows;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.Properties;
-using AntiDuplWPF.Service;
-using AntiDuplWPF.View;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.Properties;
+using AntiDupl.NET.WPF.Service;
+using AntiDupl.NET.WPF.View;
+using AntiDupl.NET.WPF.ViewModel;
 using TinyIoC;
 
 using AntiDupl.NET.Core;
 
-namespace AntiDuplWPF
+namespace AntiDupl.NET.WPF
 {
     public partial class App
     {
@@ -33,8 +33,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
             ILanguageService languageService = new LanguageService(confModel);
             TinyIoCContainer.Current.Register<ILanguageService>(languageService);
 
-            AntiDuplWPF.Resources.Resources.UserPath = AntiDuplWPF.Resources.Resources.GetDefaultUserPath();
-            CoreLib core = new CoreLib(AntiDuplWPF.Resources.Resources.UserPath);
+            AntiDupl.NET.WPF.Resources.Resources.UserPath = AntiDupl.NET.WPF.Resources.Resources.GetDefaultUserPath();
+            CoreLib core = new CoreLib(AntiDupl.NET.WPF.Resources.Resources.UserPath);
             TinyIoC.TinyIoCContainer.Current.Register<CoreLib>(core);
 
             ImageLoader imageLoader = new ImageLoader(core);
diff --git a/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs
index 3ce9b0de..93e778f9 100644
--- a/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs
@@ -9,7 +9,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class AllowableCharactersTextBoxBehavior : Behavior<TextBox>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs
index d0ef2435..7984fc8d 100644
--- a/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs
@@ -12,11 +12,11 @@
 using System.Windows.Documents;
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class DataGridContextMenuItemSourceBindingOnOpenBehavior : Behavior<DataGrid>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs
index 7c927095..5075aad4 100644
--- a/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs
@@ -8,7 +8,7 @@
 using System.Windows.Controls;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class DataGridScrollIntoViewBehavior : Behavior<DataGrid>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs
index 71f3807f..9e423a20 100644
--- a/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs
@@ -5,9 +5,9 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.DragDrop;
+using AntiDupl.NET.WPF.DragDrop;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class FrameworkElementDropBehavior : Behavior<FrameworkElement>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs
index 3462af8f..d7fce9c9 100644
--- a/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs
@@ -8,7 +8,7 @@
 using System.Windows.Media.Imaging;
 using Image = System.Windows.Controls.Image;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     // http://stackoverflow.com/questions/11305577/grey-out-image-on-button-when-element-is-disabled-simple-and-beautiful-way
     public class GrayoutImageBehavior
diff --git a/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs
index 08f2bfa0..13ac6277 100644
--- a/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs
@@ -6,11 +6,11 @@
 using System.Windows;
 using Microsoft.Xaml.Behaviors;
 using System.Windows.Controls;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 using TinyIoC;
-using AntiDuplWPF.Model;
+using AntiDupl.NET.WPF.Model;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class ImagePropertyBehavior : Behavior<Image>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs
index 31815cc9..4db8c2bf 100644
--- a/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs
@@ -6,11 +6,11 @@
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
 using TinyIoC;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class MenuItemButtonGroupBehavior : Behavior<MenuItem>
     {
diff --git a/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs b/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs
index 31ad3d6d..f628edc2 100644
--- a/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs
@@ -7,7 +7,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
 	public class MouseEnterBehaviour : Behavior<FrameworkElement>
 	{
diff --git a/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs
index 93c6f4db..05a982b0 100644
--- a/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs
+++ b/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs
@@ -7,7 +7,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     class WindowCloseOnEscBehavior : Behavior<Window>
     {
diff --git a/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs b/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs
index 2738468b..256a0234 100644
--- a/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs
+++ b/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs
@@ -8,13 +8,13 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class CalculateHistogramPeaksCommand :  ICommand
     {
diff --git a/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs b/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs
index 94968335..d95ab5f7 100644
--- a/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs
+++ b/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs
@@ -8,10 +8,10 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class ConvertToDuplPairCommand : ICommand
     {
diff --git a/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs b/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs
index de3b1e7c..ffd005c6 100644
--- a/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs
+++ b/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs
@@ -8,10 +8,10 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class ConvertToGroupCommand : ICommand
     {
diff --git a/src/AntiDupl.NET.WPF/Command/RelayCommand.cs b/src/AntiDupl.NET.WPF/Command/RelayCommand.cs
index 9c9b57e3..032015e5 100644
--- a/src/AntiDupl.NET.WPF/Command/RelayCommand.cs
+++ b/src/AntiDupl.NET.WPF/Command/RelayCommand.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     /// <summary>
     /// Taken from http://msdn.microsoft.com/en-us/magazine/dd419663.aspx#id0090030
diff --git a/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs b/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs
index 25acf626..43a82eae 100644
--- a/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs
+++ b/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs
@@ -7,9 +7,9 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.View;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.View;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
@@ -18,7 +18,7 @@
 using System.ComponentModel.Composition.Primitives;
 using MS.WindowsAPICodePack.Internal;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
    public class SearchDllCommand : ICommand
     {
diff --git a/src/AntiDupl.NET.WPF/Const.cs b/src/AntiDupl.NET.WPF/Const.cs
index dbf9a36d..6036d9d7 100644
--- a/src/AntiDupl.NET.WPF/Const.cs
+++ b/src/AntiDupl.NET.WPF/Const.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF
+namespace AntiDupl.NET.WPF
 {
     public class Const
     {
diff --git a/src/AntiDupl.NET.WPF/Control/BrushExtender.cs b/src/AntiDupl.NET.WPF/Control/BrushExtender.cs
index 9619b5ca..13eddd3e 100644
--- a/src/AntiDupl.NET.WPF/Control/BrushExtender.cs
+++ b/src/AntiDupl.NET.WPF/Control/BrushExtender.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public static class BrushExtender
     {
diff --git a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml
index 8d38f49e..614e9f88 100644
--- a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml
+++ b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="AntiDuplWPF.Control.CgsImageViewer"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.CgsImageViewer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:control="clr-namespace:AntiDuplWPF.Control"
+             xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
              mc:Ignorable="d" 
              MinWidth="320" 
              MinHeight="250"
@@ -70,16 +70,16 @@
                             </Style>
                         </StackPanel.Resources>
                         <Button x:Name="btnSelectZoom" Margin="50,0,0,0" Click="btnSelectZoom_Click" ToolTip="Change Zoom Level">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/spyglass24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/spyglass24x24.png" />
                         </Button>
                         <Button x:Name="btnFitSize" Margin="10,0,0,0" Click="btnFitSize_Click" ToolTip="Fit Image to Display">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/fit_size24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/fit_size24x24.png" />
                         </Button>
                         <Button x:Name="btnRotateLeft" Margin="45,0,0,0" Click="btnRotateLeft_Click" ToolTip="Rotate Image Left">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/rotate_left24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/rotate_left24x24.png" />
                         </Button>
                         <Button x:Name="btnRotateRight" Margin="10,0,0,0" Click="btnRotateRight_Click" ToolTip="Rotate Image Right">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/rotate_right24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/rotate_right24x24.png" />
                         </Button>
                     </StackPanel>
                 </Border>
diff --git a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs
index 31c06076..f7f0e6da 100644
--- a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs
+++ b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для CgsImageViewer.xaml
diff --git a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml
index 571c5b5c..632f1ec7 100644
--- a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml
+++ b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="AntiDuplWPF.Control.ComplexProgressBar"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.ComplexProgressBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs
index a2af1a0b..17c4fb8b 100644
--- a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs
+++ b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для ComplexProgressBar.xaml
diff --git a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml
index f97e9cf9..90fd0c1c 100644
--- a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml
+++ b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="AntiDuplWPF.Control.ImageInfoControl"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.ImageInfoControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:i="clr-namespace:Microsoft.Xaml.Behaviors;assembly=Microsoft.Xaml.Behaviors;"
-             xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
-             xmlns:control="clr-namespace:AntiDuplWPF.Control"
+             xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
+             xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
diff --git a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs
index 9b6044ac..28d2a1f1 100644
--- a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs
+++ b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs
@@ -12,9 +12,9 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для ImageInfoControl.xaml
diff --git a/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs b/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs
index 0fa661eb..5b04cebb 100644
--- a/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs
+++ b/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs
@@ -12,7 +12,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class NumericUpDown : System.Windows.Controls.Control
     {
diff --git a/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs b/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs
index a16d2923..c8f2635e 100644
--- a/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs
+++ b/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs
@@ -5,7 +5,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class PanAndZoomViewer : ContentControl
     {
diff --git a/src/AntiDupl.NET.WPF/Control/RenameImageTextBox.cs b/src/AntiDupl.NET.WPF/Control/RenameImageTextBox.cs
index b0782f1d..2f9f4210 100644
--- a/src/AntiDupl.NET.WPF/Control/RenameImageTextBox.cs
+++ b/src/AntiDupl.NET.WPF/Control/RenameImageTextBox.cs
@@ -6,15 +6,15 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.UndoRedo;
+using AntiDupl.NET.WPF.UndoRedo;
 using TinyIoC;
 using System.Windows.Input;
 using System.Windows;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.Command;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.Command;
 using System.IO;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class RenameImageTextBox : RenameTextBox
     {
diff --git a/src/AntiDupl.NET.WPF/Control/RenameTextBox.cs b/src/AntiDupl.NET.WPF/Control/RenameTextBox.cs
index a39e227b..74c3dedb 100644
--- a/src/AntiDupl.NET.WPF/Control/RenameTextBox.cs
+++ b/src/AntiDupl.NET.WPF/Control/RenameTextBox.cs
@@ -10,7 +10,7 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Represents a control that can be used for text search input.
diff --git a/src/AntiDupl.NET.WPF/Control/SearchControl.cs b/src/AntiDupl.NET.WPF/Control/SearchControl.cs
index 9613fc01..d2b78a06 100644
--- a/src/AntiDupl.NET.WPF/Control/SearchControl.cs
+++ b/src/AntiDupl.NET.WPF/Control/SearchControl.cs
@@ -12,7 +12,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class SearchControl : ContentControl
     {
diff --git a/src/AntiDupl.NET.WPF/Control/SearchControlTheme.xaml b/src/AntiDupl.NET.WPF/Control/SearchControlTheme.xaml
index 2712e949..31e53159 100644
--- a/src/AntiDupl.NET.WPF/Control/SearchControlTheme.xaml
+++ b/src/AntiDupl.NET.WPF/Control/SearchControlTheme.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:control="clr-namespace:AntiDuplWPF.Control">
+                     xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control">
     
     <Style TargetType="{x:Type control:SearchControl}">
         <Style.Setters>
diff --git a/src/AntiDupl.NET.WPF/Control/themes/NumericUpDown.xaml b/src/AntiDupl.NET.WPF/Control/themes/NumericUpDown.xaml
index a27bcd09..8d508e8a 100644
--- a/src/AntiDupl.NET.WPF/Control/themes/NumericUpDown.xaml
+++ b/src/AntiDupl.NET.WPF/Control/themes/NumericUpDown.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AntiDuplWPF.Control">
+                    xmlns:local="clr-namespace:AntiDupl.NET.WPF.Control">
     <!--<SnippetRelativeSource>-->
     <Style TargetType="{x:Type local:NumericUpDown}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
diff --git a/src/AntiDupl.NET.WPF/Control/themes/RenameTextBox.xaml b/src/AntiDupl.NET.WPF/Control/themes/RenameTextBox.xaml
index 227c2e4e..fba3b780 100644
--- a/src/AntiDupl.NET.WPF/Control/themes/RenameTextBox.xaml
+++ b/src/AntiDupl.NET.WPF/Control/themes/RenameTextBox.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AntiDuplWPF.Control">
+                    xmlns:local="clr-namespace:AntiDupl.NET.WPF.Control">
 
     <Style x:Key="NoChromeButton" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent"/>
@@ -46,7 +46,7 @@
                             Focusable="False"
                             Background="Transparent" 
                             BorderBrush="Transparent" >
-                            <Image Stretch="None" Source="/AntiDuplWPF;component/Image/check.png"/>
+                            <Image Stretch="None" Source="/AntiDupl.NET.WPF;component/Image/check.png"/>
                         </Button>
                         <Button x:Name="PART_ClearButtonHost" 
                             Grid.Column="2" Padding="2,0" 
@@ -56,7 +56,7 @@
                             BorderBrush="Transparent" 
                             VerticalAlignment="Center" 
                             Width="Auto" Height="Auto">
-                            <Image x:Name="SearchGlyphIcon" Stretch="None" Source="/AntiDuplWPF;component/Image/search_clear.png"/>
+                            <Image x:Name="SearchGlyphIcon" Stretch="None" Source="/AntiDupl.NET.WPF;component/Image/search_clear.png"/>
                         </Button>
                     </Grid>
                     <ControlTemplate.Triggers>
diff --git a/src/AntiDupl.NET.WPF/Convertor/ColorToSolidColorBrushConverter.cs b/src/AntiDupl.NET.WPF/Convertor/ColorToSolidColorBrushConverter.cs
index 51b089d1..6c63038b 100644
--- a/src/AntiDupl.NET.WPF/Convertor/ColorToSolidColorBrushConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/ColorToSolidColorBrushConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public sealed class ColorToSolidColorBrushConverter : IValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/DeleteBackgroundValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/DeleteBackgroundValueConverter.cs
index e3d4446c..12f7c5db 100644
--- a/src/AntiDupl.NET.WPF/Convertor/DeleteBackgroundValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/DeleteBackgroundValueConverter.cs
@@ -6,10 +6,10 @@
 using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class DeleteBackgroundValueConverter : IValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/DifferenceValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/DifferenceValueConverter.cs
index ca9ce6b9..9b9dbcd6 100644
--- a/src/AntiDupl.NET.WPF/Convertor/DifferenceValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/DifferenceValueConverter.cs
@@ -7,7 +7,7 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class DifferenceValueConverter : IValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/DuplResultMultiValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/DuplResultMultiValueConverter.cs
index ce01588a..a2d45871 100644
--- a/src/AntiDupl.NET.WPF/Convertor/DuplResultMultiValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/DuplResultMultiValueConverter.cs
@@ -6,10 +6,10 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class DuplResultMultiValueConverter : IMultiValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/FileSizeConverter.cs b/src/AntiDupl.NET.WPF/Convertor/FileSizeConverter.cs
index ae5f7c72..7332d91a 100644
--- a/src/AntiDupl.NET.WPF/Convertor/FileSizeConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/FileSizeConverter.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     [ValueConversion(typeof(long), typeof(string))]
     public class FileSizeConverter : IValueConverter
diff --git a/src/AntiDupl.NET.WPF/Convertor/FolderAreDiffrentMultuValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/FolderAreDiffrentMultuValueConverter.cs
index 016c5343..f363f59f 100644
--- a/src/AntiDupl.NET.WPF/Convertor/FolderAreDiffrentMultuValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/FolderAreDiffrentMultuValueConverter.cs
@@ -8,7 +8,7 @@
 using System.Windows.Media;
 
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class FolderAreDiffrentMultuValueConverter : IMultiValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/ImageBackgroundMultiValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/ImageBackgroundMultiValueConverter.cs
index 2f9b9102..2e6c5d32 100644
--- a/src/AntiDupl.NET.WPF/Convertor/ImageBackgroundMultiValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/ImageBackgroundMultiValueConverter.cs
@@ -6,9 +6,9 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class ImageBackgroundMultiValueConverter : IMultiValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/InverseBooleanConverter.cs b/src/AntiDupl.NET.WPF/Convertor/InverseBooleanConverter.cs
index b0cbb80c..b023deec 100644
--- a/src/AntiDupl.NET.WPF/Convertor/InverseBooleanConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/InverseBooleanConverter.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     [ValueConversion(typeof(bool), typeof(bool))]
     public class InverseBooleanConverter : IValueConverter
diff --git a/src/AntiDupl.NET.WPF/Convertor/ListToBackgroundMultiValueConverter.cs b/src/AntiDupl.NET.WPF/Convertor/ListToBackgroundMultiValueConverter.cs
index 3f83a5b6..e51f36d3 100644
--- a/src/AntiDupl.NET.WPF/Convertor/ListToBackgroundMultiValueConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/ListToBackgroundMultiValueConverter.cs
@@ -7,9 +7,9 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public class ListToBackgroundMultiValueConverter : IMultiValueConverter
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/MaxProperty.cs b/src/AntiDupl.NET.WPF/Convertor/MaxProperty.cs
index 205f6526..0718dd85 100644
--- a/src/AntiDupl.NET.WPF/Convertor/MaxProperty.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/MaxProperty.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     public enum MaxProperty
     {
diff --git a/src/AntiDupl.NET.WPF/Convertor/StringToVisibilityConverter.cs b/src/AntiDupl.NET.WPF/Convertor/StringToVisibilityConverter.cs
index a7b21866..92269858 100644
--- a/src/AntiDupl.NET.WPF/Convertor/StringToVisibilityConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/StringToVisibilityConverter.cs
@@ -7,7 +7,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     [ValueConversion(typeof(string), typeof(Visibility))]
     public class StringToVisibilityConverter : IValueConverter
diff --git a/src/AntiDupl.NET.WPF/Convertor/ViewModeToVisibilityConverter.cs b/src/AntiDupl.NET.WPF/Convertor/ViewModeToVisibilityConverter.cs
index 5637ca3d..f3d7e225 100644
--- a/src/AntiDupl.NET.WPF/Convertor/ViewModeToVisibilityConverter.cs
+++ b/src/AntiDupl.NET.WPF/Convertor/ViewModeToVisibilityConverter.cs
@@ -6,9 +6,9 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Convertor
+namespace AntiDupl.NET.WPF.Convertor
 {
     [ValueConversion(typeof(ViewMode), typeof(Visibility))]
     public class ViewModeToVisibilityConverter : IValueConverter
diff --git a/src/AntiDupl.NET.WPF/Core/CoreOptions.cs b/src/AntiDupl.NET.WPF/Core/CoreOptions.cs
index 823ef09e..acada7ed 100644
--- a/src/AntiDupl.NET.WPF/Core/CoreOptions.cs
+++ b/src/AntiDupl.NET.WPF/Core/CoreOptions.cs
@@ -30,9 +30,9 @@
 using System.Xml.Serialization;
 
 using AntiDupl.NET.Core;
-using AntiDuplWPF.Resources;
+using AntiDupl.NET.WPF.Resources;
 
-namespace AntiDuplWPF.Core
+namespace AntiDupl.NET.WPF.Core
 {
     public class CoreOptions
     {
@@ -93,7 +93,7 @@ public void SetDefault(CoreLib core, bool onePath)
 
             ignorePath = new CorePathWithSubFolder[1];
             ignorePath[0] = new CorePathWithSubFolder();
-            ignorePath[0].path = AntiDuplWPF.Resources.Resources.DataPath;
+            ignorePath[0].path = AntiDupl.NET.WPF.Resources.Resources.DataPath;
         }
 
         public void Get(CoreLib core, bool onePath)
@@ -276,7 +276,7 @@ public void Save(string fileName)
 
         public string GetImageDataBasePath()
         {
-            string directory = string.Format("{0}\\images\\{1}x{1}", AntiDuplWPF.Resources.Resources.UserPath, advancedOptions.reducedImageSize);
+            string directory = string.Format("{0}\\images\\{1}x{1}", AntiDupl.NET.WPF.Resources.Resources.UserPath, advancedOptions.reducedImageSize);
             DirectoryInfo directoryInfo = new DirectoryInfo(directory);
             if (!directoryInfo.Exists)
                 directoryInfo.Create();
diff --git a/src/AntiDupl.NET.WPF/Core/Location.cs b/src/AntiDupl.NET.WPF/Core/Location.cs
index 56093d32..93d623e3 100644
--- a/src/AntiDupl.NET.WPF/Core/Location.cs
+++ b/src/AntiDupl.NET.WPF/Core/Location.cs
@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.Core
+namespace AntiDupl.NET.WPF.Core
 {
     [Serializable]
     [ComVisible(false)]
diff --git a/src/AntiDupl.NET.WPF/DragDrop/IDropable.cs b/src/AntiDupl.NET.WPF/DragDrop/IDropable.cs
index 6e5a21b0..fd91ddb6 100644
--- a/src/AntiDupl.NET.WPF/DragDrop/IDropable.cs
+++ b/src/AntiDupl.NET.WPF/DragDrop/IDropable.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.DragDrop
+namespace AntiDupl.NET.WPF.DragDrop
 {
     interface IDropable
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/DataGridColumnChooserHelper.cs b/src/AntiDupl.NET.WPF/Helper/DataGridColumnChooserHelper.cs
index 67b6122d..76cdf004 100644
--- a/src/AntiDupl.NET.WPF/Helper/DataGridColumnChooserHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/DataGridColumnChooserHelper.cs
@@ -7,7 +7,7 @@
 using System.Windows.Data;
 using System.Windows.Documents;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public sealed class ReferenceEqualityComparer<T> : IEqualityComparer<T>
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/DiffrenceHelper.cs b/src/AntiDupl.NET.WPF/Helper/DiffrenceHelper.cs
index 406f6fba..5b409093 100644
--- a/src/AntiDupl.NET.WPF/Helper/DiffrenceHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/DiffrenceHelper.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     class DiffrenceHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/DirectoryHelper.cs b/src/AntiDupl.NET.WPF/Helper/DirectoryHelper.cs
index 934643aa..481a8da5 100644
--- a/src/AntiDupl.NET.WPF/Helper/DirectoryHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/DirectoryHelper.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public class DirectoryHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/GroupHelper.cs b/src/AntiDupl.NET.WPF/Helper/GroupHelper.cs
index 126cb660..e26f465a 100644
--- a/src/AntiDupl.NET.WPF/Helper/GroupHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/GroupHelper.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     class GroupHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/IOHelper.cs b/src/AntiDupl.NET.WPF/Helper/IOHelper.cs
index 8b37784d..794f289e 100644
--- a/src/AntiDupl.NET.WPF/Helper/IOHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/IOHelper.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public class IOHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/IconReader.cs b/src/AntiDupl.NET.WPF/Helper/IconReader.cs
index 68570361..71709760 100644
--- a/src/AntiDupl.NET.WPF/Helper/IconReader.cs
+++ b/src/AntiDupl.NET.WPF/Helper/IconReader.cs
@@ -9,7 +9,7 @@
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     class IconReader
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/PercentHelper.cs b/src/AntiDupl.NET.WPF/Helper/PercentHelper.cs
index ed8f1701..fe8e8162 100644
--- a/src/AntiDupl.NET.WPF/Helper/PercentHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/PercentHelper.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     class PercentHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/RenameHelper.cs b/src/AntiDupl.NET.WPF/Helper/RenameHelper.cs
index 888bc87a..59ad03ba 100644
--- a/src/AntiDupl.NET.WPF/Helper/RenameHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/RenameHelper.cs
@@ -4,11 +4,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public class RenameHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/SaatiHelper.cs b/src/AntiDupl.NET.WPF/Helper/SaatiHelper.cs
index cc51cabe..8309c378 100644
--- a/src/AntiDupl.NET.WPF/Helper/SaatiHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/SaatiHelper.cs
@@ -3,11 +3,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public class SaatiHelper
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/SerializeHelper.cs b/src/AntiDupl.NET.WPF/Helper/SerializeHelper.cs
index 3a16def7..14050c31 100644
--- a/src/AntiDupl.NET.WPF/Helper/SerializeHelper.cs
+++ b/src/AntiDupl.NET.WPF/Helper/SerializeHelper.cs
@@ -8,7 +8,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public class SerializeHelper<T>
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/VisualTreeHelperEx.cs b/src/AntiDupl.NET.WPF/Helper/VisualTreeHelperEx.cs
index 20b3a3ce..6e8c33ec 100644
--- a/src/AntiDupl.NET.WPF/Helper/VisualTreeHelperEx.cs
+++ b/src/AntiDupl.NET.WPF/Helper/VisualTreeHelperEx.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     public static class VisualTreeHelperEx
     {
diff --git a/src/AntiDupl.NET.WPF/Helper/WinAPIMethods.cs b/src/AntiDupl.NET.WPF/Helper/WinAPIMethods.cs
index 1b97e988..0e8bafe3 100644
--- a/src/AntiDupl.NET.WPF/Helper/WinAPIMethods.cs
+++ b/src/AntiDupl.NET.WPF/Helper/WinAPIMethods.cs
@@ -7,7 +7,7 @@
 using System.Security;
 using System.Text;
 
-namespace AntiDuplWPF.Helper
+namespace AntiDupl.NET.WPF.Helper
 {
     /// <summary>
     /// Contains P/Invoke methods for functions in the Windows API.
diff --git a/src/AntiDupl.NET.WPF/Model/ConfigurationModel.cs b/src/AntiDupl.NET.WPF/Model/ConfigurationModel.cs
index cdda2e9b..f12743a6 100644
--- a/src/AntiDupl.NET.WPF/Model/ConfigurationModel.cs
+++ b/src/AntiDupl.NET.WPF/Model/ConfigurationModel.cs
@@ -6,11 +6,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     public class ConfigurationModel : PropertyChangedBase, IConfigurationModel
     {
diff --git a/src/AntiDupl.NET.WPF/Model/IConfigurationModel.cs b/src/AntiDupl.NET.WPF/Model/IConfigurationModel.cs
index 4e445d41..52cd89cd 100644
--- a/src/AntiDupl.NET.WPF/Model/IConfigurationModel.cs
+++ b/src/AntiDupl.NET.WPF/Model/IConfigurationModel.cs
@@ -3,9 +3,9 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Media;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     public interface IConfigurationModel : INotifyPropertyChanged
     {
diff --git a/src/AntiDupl.NET.WPF/Model/IViewModeModel.cs b/src/AntiDupl.NET.WPF/Model/IViewModeModel.cs
index 743ed846..a8f866c8 100644
--- a/src/AntiDupl.NET.WPF/Model/IViewModeModel.cs
+++ b/src/AntiDupl.NET.WPF/Model/IViewModeModel.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     public interface IViewModeModel : INotifyPropertyChanged
     {
diff --git a/src/AntiDupl.NET.WPF/Model/IgnoreStorage.cs b/src/AntiDupl.NET.WPF/Model/IgnoreStorage.cs
index ff452690..051d7b75 100644
--- a/src/AntiDupl.NET.WPF/Model/IgnoreStorage.cs
+++ b/src/AntiDupl.NET.WPF/Model/IgnoreStorage.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     public class IgnoreStorage
     {
diff --git a/src/AntiDupl.NET.WPF/Model/LocationsModel.cs b/src/AntiDupl.NET.WPF/Model/LocationsModel.cs
index 3fe95ca5..ba56fbaf 100644
--- a/src/AntiDupl.NET.WPF/Model/LocationsModel.cs
+++ b/src/AntiDupl.NET.WPF/Model/LocationsModel.cs
@@ -6,16 +6,16 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Xml.Serialization;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 using static System.Formats.Asn1.AsnWriter;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     [Serializable()]
     [XmlInclude(typeof(Location))]
@@ -123,9 +123,9 @@ public void CopyToDll()
             }
             _core.searchPath = (CorePathWithSubFolder[])searchPathes.ToArray();
             /*locations = IgnoreLocations.Select(l => l.Model);
-            _core.SetLocation(locations, AntiDuplWPF.Core.CoreDll.PathType.Ignore);
+            _core.SetLocation(locations, AntiDupl.NET.WPF.Core.CoreDll.PathType.Ignore);
             locations = ValidLocations.Select(l => l.Model);
-            _core.SetLocation(locations, AntiDuplWPF.Core.CoreDll.PathType.Valid);*/
+            _core.SetLocation(locations, AntiDupl.NET.WPF.Core.CoreDll.PathType.Valid);*/
         }
 
         ICommand _deleteLocationCommand;
diff --git a/src/AntiDupl.NET.WPF/Model/ViewModeModel.cs b/src/AntiDupl.NET.WPF/Model/ViewModeModel.cs
index e3238953..12e2ba28 100644
--- a/src/AntiDupl.NET.WPF/Model/ViewModeModel.cs
+++ b/src/AntiDupl.NET.WPF/Model/ViewModeModel.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Model
+namespace AntiDupl.NET.WPF.Model
 {
     public class ViewModeModel : PropertyChangedBase, IViewModeModel
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionCondition.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionCondition.cs
index e64c64e5..ba8063e4 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionCondition.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionCondition.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
    /* public enum ActionCondition
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/AllBestGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/AllBestGenerator.cs
index 25e7dc54..5986e939 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/AllBestGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/AllBestGenerator.cs
@@ -4,14 +4,14 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ByPath;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ObjectModel.DirectoryFilter;
-using AntiDuplWPF.ObjectModel.GettingNumber;
-using AntiDuplWPF.UndoRedo;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ByPath;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.DirectoryFilter;
+using AntiDupl.NET.WPF.ObjectModel.GettingNumber;
+using AntiDupl.NET.WPF.UndoRedo;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
     class AllBestGenerator : ConfigurableActionGenerator
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/BlockinesBluringGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/BlockinesBluringGenerator.cs
index 76c6ad60..e4509e87 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/BlockinesBluringGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/BlockinesBluringGenerator.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
 	class BlockinesBluringGenerator : ConfigurableActionGenerator
 	{
@@ -20,7 +20,7 @@ public BlockinesBluringGenerator(ObservableCollection<GettingNumber.IGettingNumb
 		{
 			Name = "Blockines and Bluring";
 
-			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDuplWPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
+			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDupl.NET.WPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
 
 
 			FilterConditions.Add(new FilterCondition()
@@ -57,9 +57,9 @@ public BlockinesBluringGenerator(ObservableCollection<GettingNumber.IGettingNumb
 			SelectingBestImageByProperty.ConditionsOfSelectingBestImageByProperty.Add(
 				new ConditionOfSelectingBestImageByProperty() { Parametr = BestConditionParametr.BlurringBest });
 
-			BestByPath = bestSelectingByPathList.Single(s => s is AntiDuplWPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
+			BestByPath = bestSelectingByPathList.Single(s => s is AntiDupl.NET.WPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
 
-			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDuplWPF.ObjectModel.DirectoryFilter.SameDirectory);
+			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDupl.NET.WPF.ObjectModel.DirectoryFilter.SameDirectory);
 		}
 	}
 }
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/ConfigurableActionGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/ConfigurableActionGenerator.cs
index e72f6929..487d98ca 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/ConfigurableActionGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/ConfigurableActionGenerator.cs
@@ -4,15 +4,15 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ByPath;
-using AntiDuplWPF.ObjectModel.ConfigurableAction;
-using AntiDuplWPF.ObjectModel.DirectoryFilter;
-using AntiDuplWPF.ObjectModel.GettingNumber;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ByPath;
+using AntiDupl.NET.WPF.ObjectModel.ConfigurableAction;
+using AntiDupl.NET.WPF.ObjectModel.DirectoryFilter;
+using AntiDupl.NET.WPF.ObjectModel.GettingNumber;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
     public class ConfigurableActionGenerator : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakBluringGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakBluringGenerator.cs
index 89004898..610c560a 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakBluringGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakBluringGenerator.cs
@@ -4,12 +4,12 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ObjectModel.GettingNumber;
-using AntiDuplWPF.UndoRedo;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.GettingNumber;
+using AntiDupl.NET.WPF.UndoRedo;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
     class FileSizePeakBluringGenerator : ConfigurableActionGenerator
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakGenerator.cs
index db5fdaef..f1bea54f 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/FileSizePeakGenerator.cs
@@ -4,12 +4,12 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ObjectModel.GettingNumber;
-using AntiDuplWPF.UndoRedo;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.GettingNumber;
+using AntiDupl.NET.WPF.UndoRedo;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
     class FileSizePeakGenerator : ConfigurableActionGenerator
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator.cs
index ef164dcc..5cd5da1b 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
 	class LittleDifferenceGenerator : ConfigurableActionGenerator
 	{
@@ -19,7 +19,7 @@ public LittleDifferenceGenerator(ObservableCollection<GettingNumber.IGettingNumb
 		{
 			Name = "Little difference";
 
-			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDuplWPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
+			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDupl.NET.WPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
 
 
 			FilterConditions.Add(new FilterCondition()
@@ -66,9 +66,9 @@ public LittleDifferenceGenerator(ObservableCollection<GettingNumber.IGettingNumb
 			SelectingBestImageByProperty.ConditionsOfSelectingBestImageByProperty.Add(
 				new ConditionOfSelectingBestImageByProperty() { Parametr = BestConditionParametr.BlockinessBest });
 
-			BestByPath = bestSelectingByPathList.Single(s => s is AntiDuplWPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
+			BestByPath = bestSelectingByPathList.Single(s => s is AntiDupl.NET.WPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
 
-			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDuplWPF.ObjectModel.DirectoryFilter.SameDirectory);
+			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDupl.NET.WPF.ObjectModel.DirectoryFilter.SameDirectory);
 		}
 	}
 }
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator2.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator2.cs
index 1747ce80..101e9e92 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator2.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionGenerator/LittleDifferenceGenerator2.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
 
-namespace AntiDuplWPF.ObjectModel.ActionGenerator
+namespace AntiDupl.NET.WPF.ObjectModel.ActionGenerator
 {
 	class LittleDifferenceGenerator2 : ConfigurableActionGenerator
 	{
@@ -19,7 +19,7 @@ public LittleDifferenceGenerator2(ObservableCollection<GettingNumber.IGettingNum
 		{
 			Name = "Little difference2";
 
-			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDuplWPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
+			AlgorithmOfGettingNumberFromFileName = algorithmsOfGettingNumberFromFileName.Single(a => a is AntiDupl.NET.WPF.ObjectModel.GettingNumber.NumberBeforeUnderlineGettingNumber);
 
 
 			FilterConditions.Add(new FilterCondition()
@@ -67,9 +67,9 @@ public LittleDifferenceGenerator2(ObservableCollection<GettingNumber.IGettingNum
 			SelectingBestImageByProperty.ConditionsOfSelectingBestImageByProperty.Add(
 				new ConditionOfSelectingBestImageByProperty() { Parametr = BestConditionParametr.BlockinessBest });
 
-			BestByPath = bestSelectingByPathList.Single(s => s is AntiDuplWPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
+			BestByPath = bestSelectingByPathList.Single(s => s is AntiDupl.NET.WPF.ObjectModel.ByPath.BestImageShouldHaveASmallerNumber);
 
-			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDuplWPF.ObjectModel.DirectoryFilter.SameDirectory);
+			DirectoryFilter = allDirectoryFilters.Single(df => df is AntiDupl.NET.WPF.ObjectModel.DirectoryFilter.SameDirectory);
 		}
 	}
 }
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ActionOnDuplPair.cs b/src/AntiDupl.NET.WPF/ObjectModel/ActionOnDuplPair.cs
index 0273cafd..2174d6b7 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ActionOnDuplPair.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ActionOnDuplPair.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum ActionOnDuplPair
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/BindableMenuItem.cs b/src/AntiDupl.NET.WPF/ObjectModel/BindableMenuItem.cs
index 7c0d6e5d..eb7baca7 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/BindableMenuItem.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/BindableMenuItem.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class BindableMenuItem
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/BestConditionParametr.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/BestConditionParametr.cs
index 6331d3ea..92e27279 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/BestConditionParametr.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/BestConditionParametr.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum BestConditionParametr
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/ConditionOfSelectingBestImageByProperty.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/ConditionOfSelectingBestImageByProperty.cs
index 93207f1d..9d1c99b2 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/ConditionOfSelectingBestImageByProperty.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/ConditionOfSelectingBestImageByProperty.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel.ByImageProperty
+namespace AntiDupl.NET.WPF.ObjectModel.ByImageProperty
 {
     public class ConditionOfSelectingBestImageByProperty : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/SelectingBestImageByProperty.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/SelectingBestImageByProperty.cs
index 4d2b81f7..5b5e753c 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/SelectingBestImageByProperty.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByImageProperty/SelectingBestImageByProperty.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel.ByImageProperty
+namespace AntiDupl.NET.WPF.ObjectModel.ByImageProperty
 {
     public class SelectingBestImageByProperty : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldBeInDirectory.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldBeInDirectory.cs
index ec228216..a9fbbaeb 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldBeInDirectory.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldBeInDirectory.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ByPath
+namespace AntiDupl.NET.WPF.ObjectModel.ByPath
 {
     class BestImageShouldBeInDirectory : IBestSelectingByPath
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldHaveASmallerNumber.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldHaveASmallerNumber.cs
index 2aa915de..f41ced19 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldHaveASmallerNumber.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/BestImageShouldHaveASmallerNumber.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ByPath
+namespace AntiDupl.NET.WPF.ObjectModel.ByPath
 {
     class BestImageShouldHaveASmallerNumber : IBestSelectingByPath
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/IBestSelectingByPath.cs b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/IBestSelectingByPath.cs
index b1973dbb..c10164cc 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ByPath/IBestSelectingByPath.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ByPath/IBestSelectingByPath.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ByPath
+namespace AntiDupl.NET.WPF.ObjectModel.ByPath
 {
     public interface IBestSelectingByPath
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/EqualConditionMode.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/EqualConditionMode.cs
index c4a76e91..dad8c211 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/EqualConditionMode.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/EqualConditionMode.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConditionMode
+namespace AntiDupl.NET.WPF.ObjectModel.ConditionMode
 {
     class EqualConditionMode : IConditionMode
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/IConditionMode.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/IConditionMode.cs
index d60fd60f..9637ed29 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/IConditionMode.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/IConditionMode.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConditionMode
+namespace AntiDupl.NET.WPF.ObjectModel.ConditionMode
 {
     public interface IConditionMode
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/LessConditionMode.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/LessConditionMode.cs
index 452d7c28..8c5b8b69 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/LessConditionMode.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/LessConditionMode.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConditionMode
+namespace AntiDupl.NET.WPF.ObjectModel.ConditionMode
 {
     class LessConditionMode : IConditionMode
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/MoreConditionMode.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/MoreConditionMode.cs
index 29b5ad69..5a438adc 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/MoreConditionMode.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConditionMode/MoreConditionMode.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConditionMode
+namespace AntiDupl.NET.WPF.ObjectModel.ConditionMode
 {
     class MoreConditionMode : IConditionMode
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteBadAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteBadAction.cs
index 5f180f3c..0dbbc4cb 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteBadAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteBadAction.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
    /* class DeleteBadAction : IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteOtherAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteOtherAction.cs
index d89e6410..c2ce3167 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteOtherAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/DeleteOtherAction.cs
@@ -6,9 +6,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.UndoRedo;
+using AntiDupl.NET.WPF.UndoRedo;
 
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
     class DeleteOtherAction : IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/IConfigurableAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/IConfigurableAction.cs
index 3d6979f5..b37d348e 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/IConfigurableAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/IConfigurableAction.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
     public interface IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceAndDeleteAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceAndDeleteAction.cs
index 35684c77..ed1b0070 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceAndDeleteAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceAndDeleteAction.cs
@@ -6,10 +6,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
     class ReplaceAndDeleteAction : IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceBadImageAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceBadImageAction.cs
index 590bf9ac..7966b746 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceBadImageAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/ReplaceBadImageAction.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
    /* class ReplaceBadImageAction : IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/SkipAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/SkipAction.cs
index e96d3708..e7dba8a6 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/SkipAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ConfigurableAction/SkipAction.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.ConfigurableAction
+namespace AntiDupl.NET.WPF.ObjectModel.ConfigurableAction
 {
     public class SkipAction : IConfigurableAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/Criterion.cs b/src/AntiDupl.NET.WPF/ObjectModel/Criterion.cs
index 577181f6..ebe145db 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/Criterion.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/Criterion.cs
@@ -4,9 +4,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class Criterion : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/CriterionType.cs b/src/AntiDupl.NET.WPF/ObjectModel/CriterionType.cs
index 0723d3fc..d661476d 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/CriterionType.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/CriterionType.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum CriterionType
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/AnywhereDirectoryFilter.cs b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/AnywhereDirectoryFilter.cs
index 113e0f9a..c270f938 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/AnywhereDirectoryFilter.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/AnywhereDirectoryFilter.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.DirectoryFilter
+namespace AntiDupl.NET.WPF.ObjectModel.DirectoryFilter
 {
     class AnywhereDirectoryFilter : IDirectoryFilter
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/IDirectoryFilter.cs b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/IDirectoryFilter.cs
index 15638580..d5b14725 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/IDirectoryFilter.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/IDirectoryFilter.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.DirectoryFilter
+namespace AntiDupl.NET.WPF.ObjectModel.DirectoryFilter
 {
     public interface IDirectoryFilter
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/OneImageInDir1OtherInDir2.cs b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/OneImageInDir1OtherInDir2.cs
index 5c174ce4..dc24e183 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/OneImageInDir1OtherInDir2.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/OneImageInDir1OtherInDir2.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.DirectoryFilter
+namespace AntiDupl.NET.WPF.ObjectModel.DirectoryFilter
 {
     class OneImageInDir1OtherInDir2 : IDirectoryFilter
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/SameDirectory.cs b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/SameDirectory.cs
index 5076d4ca..b61bc99d 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/SameDirectory.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/DirectoryFilter/SameDirectory.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.DirectoryFilter
+namespace AntiDupl.NET.WPF.ObjectModel.DirectoryFilter
 {
     class SameDirectory : IDirectoryFilter
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/DuplicateGroup.cs b/src/AntiDupl.NET.WPF/ObjectModel/DuplicateGroup.cs
index edccd764..cdec6927 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/DuplicateGroup.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/DuplicateGroup.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel.ConfigurableAction;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel.ConfigurableAction;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class DuplicateGroup
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/EqualAction.cs b/src/AntiDupl.NET.WPF/ObjectModel/EqualAction.cs
index cec7e6ab..8631ddc0 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/EqualAction.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/EqualAction.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum EqualAction
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/FilterCondition.cs b/src/AntiDupl.NET.WPF/ObjectModel/FilterCondition.cs
index 702883b6..eff96531 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/FilterCondition.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/FilterCondition.cs
@@ -4,13 +4,13 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class FilterCondition : PropertyChangedBase
     {
@@ -59,8 +59,8 @@ public uint ValueUint
             }
         }
 
-        //AntiDuplWPF.Core.CoreDll.TransformType _transformType;
-        //public AntiDuplWPF.Core.CoreDll.TransformType TransformType
+        //AntiDupl.NET.WPF.Core.CoreDll.TransformType _transformType;
+        //public AntiDupl.NET.WPF.Core.CoreDll.TransformType TransformType
         //      {
         //          get { return _transformType; }
         //    set
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/FilterConditionParametr.cs b/src/AntiDupl.NET.WPF/ObjectModel/FilterConditionParametr.cs
index 89ec3999..3a9576b7 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/FilterConditionParametr.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/FilterConditionParametr.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum FilterConditionParametr
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/IGettingNumber.cs b/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/IGettingNumber.cs
index 665ca3e7..b98fd9cc 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/IGettingNumber.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/IGettingNumber.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.GettingNumber
+namespace AntiDupl.NET.WPF.ObjectModel.GettingNumber
 {
     public interface IGettingNumber
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/NumberBeforeUnderlineGettingNumber.cs b/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/NumberBeforeUnderlineGettingNumber.cs
index a91d3f94..73e4b844 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/NumberBeforeUnderlineGettingNumber.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/GettingNumber/NumberBeforeUnderlineGettingNumber.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel.GettingNumber
+namespace AntiDupl.NET.WPF.ObjectModel.GettingNumber
 {
     class NumberBeforeUnderlineGettingNumber : IGettingNumber
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ImageInfoClass.cs b/src/AntiDupl.NET.WPF/ObjectModel/ImageInfoClass.cs
index ede68fa0..4038f80f 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ImageInfoClass.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ImageInfoClass.cs
@@ -10,14 +10,14 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using System.Xml.Serialization;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.Service;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.Service;
+using AntiDupl.NET.WPF.ViewModel;
 using TinyIoC;
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class ImageInfoClass : PropertyChangedBase, IEquatable<ImageInfoClass> 
     {
@@ -44,7 +44,7 @@ public ImageInfoClass()
             Application.Current.Dispatcher.Invoke(DispatcherPriority.Normal,
                        (Action)delegate
                        {
-                           _dumbImage = new BitmapImage(new Uri("pack://application:,,,/AntiDuplWPF;component/Image/loading.jpg", UriKind.Absolute));
+                           _dumbImage = new BitmapImage(new Uri("pack://application:,,,/AntiDupl.NET.WPF;component/Image/loading.jpg", UriKind.Absolute));
                        });
 
 
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/LogEntry.cs b/src/AntiDupl.NET.WPF/ObjectModel/LogEntry.cs
index 75db4884..3d4414df 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/LogEntry.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/LogEntry.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public class LogEntry
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/PositionInDuplPair.cs b/src/AntiDupl.NET.WPF/ObjectModel/PositionInDuplPair.cs
index 2531def3..ffcc68e6 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/PositionInDuplPair.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/PositionInDuplPair.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum PositionInDuplPair
     {
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/SerializableCultureInfo.cs b/src/AntiDupl.NET.WPF/ObjectModel/SerializableCultureInfo.cs
index 5c0d1e0e..046f47e2 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/SerializableCultureInfo.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/SerializableCultureInfo.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     [Serializable]
     public class SerializableCultureInfo
diff --git a/src/AntiDupl.NET.WPF/ObjectModel/ViewMode.cs b/src/AntiDupl.NET.WPF/ObjectModel/ViewMode.cs
index fd6f1b38..fb475c75 100644
--- a/src/AntiDupl.NET.WPF/ObjectModel/ViewMode.cs
+++ b/src/AntiDupl.NET.WPF/ObjectModel/ViewMode.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ObjectModel
+namespace AntiDupl.NET.WPF.ObjectModel
 {
     public enum ViewMode
     {
diff --git a/src/AntiDupl.NET.WPF/Properties/AssemblyInfo.cs b/src/AntiDupl.NET.WPF/Properties/AssemblyInfo.cs
index 7553e727..864ee2fb 100644
--- a/src/AntiDupl.NET.WPF/Properties/AssemblyInfo.cs
+++ b/src/AntiDupl.NET.WPF/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // Управление общими сведениями о сборке осуществляется с помощью 
 // набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
 // связанные со сборкой.
-[assembly: AssemblyTitle("AntiDuplWPF")]
+[assembly: AssemblyTitle("AntiDupl.NET.WPF")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AntiDuplWPF")]
+[assembly: AssemblyProduct("AntiDupl.NET.WPF")]
 [assembly: AssemblyCopyright("Copyright Ihar Yermalayeu, Borisov Dmitry ©  2017-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/src/AntiDupl.NET.WPF/Properties/Settings.Designer.cs b/src/AntiDupl.NET.WPF/Properties/Settings.Designer.cs
index 30cb4244..74c5de02 100644
--- a/src/AntiDupl.NET.WPF/Properties/Settings.Designer.cs
+++ b/src/AntiDupl.NET.WPF/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AntiDuplWPF.Properties {
+namespace AntiDupl.NET.WPF.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/src/AntiDupl.NET.WPF/Resources/Resources.cs b/src/AntiDupl.NET.WPF/Resources/Resources.cs
index fc3248ff..3937bbf5 100644
--- a/src/AntiDupl.NET.WPF/Resources/Resources.cs
+++ b/src/AntiDupl.NET.WPF/Resources/Resources.cs
@@ -33,7 +33,7 @@
 using System.Diagnostics;
 using System.ComponentModel;
 
-namespace AntiDuplWPF.Resources
+namespace AntiDupl.NET.WPF.Resources
 {
     static public class Resources
     {
diff --git a/src/AntiDupl.NET.WPF/Service/IImageLoader.cs b/src/AntiDupl.NET.WPF/Service/IImageLoader.cs
index da7a6902..758383c8 100644
--- a/src/AntiDupl.NET.WPF/Service/IImageLoader.cs
+++ b/src/AntiDupl.NET.WPF/Service/IImageLoader.cs
@@ -6,7 +6,7 @@
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     interface IImageLoader
     {
diff --git a/src/AntiDupl.NET.WPF/Service/ILanguageService.cs b/src/AntiDupl.NET.WPF/Service/ILanguageService.cs
index 5cfd0ecb..57ff215e 100644
--- a/src/AntiDupl.NET.WPF/Service/ILanguageService.cs
+++ b/src/AntiDupl.NET.WPF/Service/ILanguageService.cs
@@ -6,9 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     public interface ILanguageService
     {
diff --git a/src/AntiDupl.NET.WPF/Service/IThumbnailProvider.cs b/src/AntiDupl.NET.WPF/Service/IThumbnailProvider.cs
index 88b81a42..8d2fd8cb 100644
--- a/src/AntiDupl.NET.WPF/Service/IThumbnailProvider.cs
+++ b/src/AntiDupl.NET.WPF/Service/IThumbnailProvider.cs
@@ -1,13 +1,13 @@
 using System;
 using System.ComponentModel;
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     public interface IThumbnailProvider : IDisposable
     {
         event PropertyChangedEventHandler PropertyChanged;
         void ClearThumbnailCache();
         void Dispose();
-        void Enqueue(AntiDuplWPF.ObjectModel.ImageInfoClass item);
+        void Enqueue(AntiDupl.NET.WPF.ObjectModel.ImageInfoClass item);
         string ThumbnailCacheStatus { get; set; }
     }
 }
diff --git a/src/AntiDupl.NET.WPF/Service/ImageLoader.cs b/src/AntiDupl.NET.WPF/Service/ImageLoader.cs
index 07fc904a..0b2a074a 100644
--- a/src/AntiDupl.NET.WPF/Service/ImageLoader.cs
+++ b/src/AntiDupl.NET.WPF/Service/ImageLoader.cs
@@ -8,13 +8,13 @@
 using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using AntiDuplWPF.Core;
+using AntiDupl.NET.WPF.Core;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 using AntiDupl.NET.Core.Enums;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     class ImageLoader : IImageLoader
     {
diff --git a/src/AntiDupl.NET.WPF/Service/LanguageService.cs b/src/AntiDupl.NET.WPF/Service/LanguageService.cs
index 13eb08c7..176f6c0f 100644
--- a/src/AntiDupl.NET.WPF/Service/LanguageService.cs
+++ b/src/AntiDupl.NET.WPF/Service/LanguageService.cs
@@ -7,12 +7,12 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     class LanguageService : ILanguageService
     {
diff --git a/src/AntiDupl.NET.WPF/Service/ThumbnailCache.cs b/src/AntiDupl.NET.WPF/Service/ThumbnailCache.cs
index c8891a0b..d9a83bb6 100644
--- a/src/AntiDupl.NET.WPF/Service/ThumbnailCache.cs
+++ b/src/AntiDupl.NET.WPF/Service/ThumbnailCache.cs
@@ -5,9 +5,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
-using AntiDuplWPF.Model;
+using AntiDupl.NET.WPF.Model;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
     class ThumbnailCache
     {
diff --git a/src/AntiDupl.NET.WPF/Service/ThumbnailProvider.cs b/src/AntiDupl.NET.WPF/Service/ThumbnailProvider.cs
index 3e0924ec..7fbaa747 100644
--- a/src/AntiDupl.NET.WPF/Service/ThumbnailProvider.cs
+++ b/src/AntiDupl.NET.WPF/Service/ThumbnailProvider.cs
@@ -9,14 +9,14 @@
 using System.Windows;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 using TinyIoC;
 
-namespace AntiDuplWPF.Service
+namespace AntiDupl.NET.WPF.Service
 {
-    class ThumbnailProvider : PropertyChangedBase, AntiDuplWPF.Service.IThumbnailProvider
+    class ThumbnailProvider : PropertyChangedBase, AntiDupl.NET.WPF.Service.IThumbnailProvider
     {
         //from http://rsdn.org/article/dotnet/CSThreading1.xml
         EventWaitHandle wh = new AutoResetEvent(false);
diff --git a/src/AntiDupl.NET.WPF/Themes/Generic.xaml b/src/AntiDupl.NET.WPF/Themes/Generic.xaml
index 8e266b56..a764e995 100644
--- a/src/AntiDupl.NET.WPF/Themes/Generic.xaml
+++ b/src/AntiDupl.NET.WPF/Themes/Generic.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/AntiDuplWPF;component/Control/themes/NumericUpDown.xaml" />
-        <ResourceDictionary Source="/AntiDuplWPF;component/Control/themes/RenameTextBox.xaml" />
+        <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Control/themes/NumericUpDown.xaml" />
+        <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Control/themes/RenameTextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/AutoDeleteMultiPairCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/AutoDeleteMultiPairCommand.cs
index be3752f2..2d168931 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/AutoDeleteMultiPairCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/AutoDeleteMultiPairCommand.cs
@@ -7,11 +7,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class AutoDeleteMultiPairCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteCurrentImageCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteCurrentImageCommand.cs
index 27d64169..72fd8fc2 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteCurrentImageCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteCurrentImageCommand.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteCurrentImageCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteImageCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteImageCommand.cs
index f3853996..6c534259 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteImageCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteImageCommand.cs
@@ -6,11 +6,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteImageCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteMultiCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteMultiCommand.cs
index 6b3dd0ac..13170b6c 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteMultiCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteMultiCommand.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteMultiCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherCommand.cs
index 65c4f2d3..8f67272e 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherCommand.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteOtherCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromGroupCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromGroupCommand.cs
index 16bc655e..b2762b03 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromGroupCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromGroupCommand.cs
@@ -7,10 +7,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteOtherFromGroupCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromPairCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromPairCommand.cs
index 94d872fa..9ba6f39d 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromPairCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/DeleteOtherFromPairCommand.cs
@@ -7,11 +7,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class DeleteOtherFromPairCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/IUCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/IUCommand.cs
index c59168cc..d27187a9 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/IUCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/IUCommand.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     public interface IUCommand : IDisposable
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/IUndoRedoEngine.cs b/src/AntiDupl.NET.WPF/UndoRedo/IUndoRedoEngine.cs
index cf9d9f1e..cc38ed78 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/IUndoRedoEngine.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/IUndoRedoEngine.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     public interface IUndoRedoEngine : INotifyPropertyChanged
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/IgnoreMultiPairCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/IgnoreMultiPairCommand.cs
index e958796c..bb535234 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/IgnoreMultiPairCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/IgnoreMultiPairCommand.cs
@@ -6,9 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class IgnoreMultiPairCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/IgnorePairCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/IgnorePairCommand.cs
index 0ea7eed2..d57dd997 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/IgnorePairCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/IgnorePairCommand.cs
@@ -6,9 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class IgnorePairCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/RenameImageCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/RenameImageCommand.cs
index f114a570..f913aa17 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/RenameImageCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/RenameImageCommand.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class RenameImageCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/RenameLikeCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/RenameLikeCommand.cs
index 53de5931..c1ad9eee 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/RenameLikeCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/RenameLikeCommand.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class RenameLikeCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/RenamedImage.cs b/src/AntiDupl.NET.WPF/UndoRedo/RenamedImage.cs
index d00d3e41..506616d0 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/RenamedImage.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/RenamedImage.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     struct RenamedImage
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/Replace2Command.cs b/src/AntiDupl.NET.WPF/UndoRedo/Replace2Command.cs
index 0358fb52..b664e067 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/Replace2Command.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/Replace2Command.cs
@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class Replace2Command : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/ReplaceCommand.cs b/src/AntiDupl.NET.WPF/UndoRedo/ReplaceCommand.cs
index 977374a6..fa7e73c1 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/ReplaceCommand.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/ReplaceCommand.cs
@@ -6,11 +6,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     class ReplaceCommand : IUCommand
     {
diff --git a/src/AntiDupl.NET.WPF/UndoRedo/UndoRedoEngine.cs b/src/AntiDupl.NET.WPF/UndoRedo/UndoRedoEngine.cs
index 66922484..00174077 100644
--- a/src/AntiDupl.NET.WPF/UndoRedo/UndoRedoEngine.cs
+++ b/src/AntiDupl.NET.WPF/UndoRedo/UndoRedoEngine.cs
@@ -4,10 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.UndoRedo
+namespace AntiDupl.NET.WPF.UndoRedo
 {
     public class UndoRedoEngine : PropertyChangedBase, INotifyPropertyChanged, IUndoRedoEngine
     {
diff --git a/src/AntiDupl.NET.WPF/View/ColorWindow.xaml b/src/AntiDupl.NET.WPF/View/ColorWindow.xaml
index 33123e9a..f1c7d439 100644
--- a/src/AntiDupl.NET.WPF/View/ColorWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/ColorWindow.xaml
@@ -1,7 +1,7 @@
-<Window x:Class="AntiDuplWPF.View.ColorWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.ColorWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:control="clr-namespace:AntiDuplWPF.Control"
+        xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
         Title="ColorWindow" 
         Height="250" 
         Width="300">
diff --git a/src/AntiDupl.NET.WPF/View/ColorWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/ColorWindow.xaml.cs
index a26a62fd..afed4cd8 100644
--- a/src/AntiDupl.NET.WPF/View/ColorWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/ColorWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для ColorWindow.xaml
diff --git a/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml b/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml
index 1133a8df..3038a5ba 100644
--- a/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml
@@ -1,10 +1,10 @@
-<Window x:Class="AntiDuplWPF.View.ComparatorWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.ComparatorWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:control="clr-namespace:AntiDuplWPF.Control"
-        xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
-        xmlns:behavior="clr-namespace:AntiDuplWPF.Behavior"
+        xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
+        xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
+        xmlns:behavior="clr-namespace:AntiDupl.NET.WPF.Behavior"
         Title="ComparatorWindow">
     <Window.Resources>
         <convertor:ListToBackgroundMultiValueConverter x:Key="listToBackgroundMultiValueConverter"/>
@@ -51,7 +51,7 @@
 
             <Button Command="{Binding PreviousCommand}" Grid.Column="0">
                 <StackPanel Orientation="Horizontal">
-                    <Image Source ="/AntiDuplWPF;component/Image/arrow-190-64-left.png" MaxHeight="16" />
+                    <Image Source ="/AntiDupl.NET.WPF;component/Image/arrow-190-64-left.png" MaxHeight="16" />
                     <Label Content="Previous" />
                 </StackPanel>
             </Button>
@@ -60,7 +60,7 @@
             <Button Command="{Binding NextCommand}" Grid.Column="2" >
                 <StackPanel Orientation="Horizontal">
                     <Label Content="Next" />
-                    <Image Source ="/AntiDuplWPF;component/Image/arrow-190-64-rigth.png" MaxHeight="16" />
+                    <Image Source ="/AntiDupl.NET.WPF;component/Image/arrow-190-64-rigth.png" MaxHeight="16" />
                 </StackPanel>
             </Button>
         </Grid>
diff --git a/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml.cs
index 1645c34e..6b156043 100644
--- a/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/ComparatorWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для ComparatorWindow.xaml
diff --git a/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml b/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml
index d35bcf3c..4314eeaa 100644
--- a/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="AntiDuplWPF.View.ConfigurableActionWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.ConfigurableActionWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:objectModel="clr-namespace:AntiDuplWPF.ObjectModel"
-        xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
+        xmlns:objectModel="clr-namespace:AntiDupl.NET.WPF.ObjectModel"
+        xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
         Title="ConfigurableActionWindow" 
         Height="600" 
         Width="500">
diff --git a/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml.cs
index 4ac08247..8f1ca4eb 100644
--- a/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/ConfigurableActionWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для ConfigurableActionWindow.xaml
diff --git a/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml b/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml
index a5f84275..f5a48567 100644
--- a/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml
@@ -1,16 +1,16 @@
-<Window x:Class="AntiDuplWPF.View.ConfigurationWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.ConfigurationWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:behavior="clr-namespace:AntiDuplWPF.Behavior"
+        xmlns:behavior="clr-namespace:AntiDupl.NET.WPF.Behavior"
         xmlns:core="clr-namespace:AntiDupl.NET.Core.Enums;assembly=AntiDupl.NET.Core"
         Title="ConfigurationWindow"
         Height="400" Width="500"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:viewModel="clr-namespace:AntiDuplWPF.ViewModel"
-        xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
+        xmlns:viewModel="clr-namespace:AntiDupl.NET.WPF.ViewModel"
+        xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance viewModel:ConfigurationViewModel, IsDesignTimeCreatable=False}">
     <Window.Resources>
diff --git a/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml.cs
index 4d9e9fe4..cb5374d0 100644
--- a/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/ConfigurationWindow.xaml.cs
@@ -1,4 +1,4 @@
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     public partial class ConfigurationWindow
     {
diff --git a/src/AntiDupl.NET.WPF/View/IWindowService.cs b/src/AntiDupl.NET.WPF/View/IWindowService.cs
index c201a7a5..b89e4c7c 100644
--- a/src/AntiDupl.NET.WPF/View/IWindowService.cs
+++ b/src/AntiDupl.NET.WPF/View/IWindowService.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     public interface IWindowService
     {
diff --git a/src/AntiDupl.NET.WPF/View/MainWindow.xaml b/src/AntiDupl.NET.WPF/View/MainWindow.xaml
index 86374fb9..40f0e84f 100644
--- a/src/AntiDupl.NET.WPF/View/MainWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/MainWindow.xaml
@@ -1,16 +1,16 @@
-<Window x:Class="AntiDuplWPF.View.MainWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:behavior="clr-namespace:AntiDuplWPF.Behavior"
-        xmlns:control="clr-namespace:AntiDuplWPF.Control"
-        xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
-        xmlns:objectModel="clr-namespace:AntiDuplWPF.ObjectModel"
+        xmlns:behavior="clr-namespace:AntiDupl.NET.WPF.Behavior"
+        xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
+        xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
+        xmlns:objectModel="clr-namespace:AntiDupl.NET.WPF.ObjectModel"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        xmlns:viewModel="clr-namespace:AntiDuplWPF.ViewModel"
-        xmlns:helper="clr-namespace:AntiDuplWPF.Helper"
+        xmlns:viewModel="clr-namespace:AntiDupl.NET.WPF.ViewModel"
+        xmlns:helper="clr-namespace:AntiDupl.NET.WPF.Helper"
         Title="{Binding Title, Mode=OneWay}"
         Height="350" Width="625"
         d:DataContext="{d:DesignInstance viewModel:MainViewModel, IsDesignTimeCreatable=False}"
@@ -254,7 +254,7 @@
                                         <Button ToolTip="{DynamicResource mainwindow_tabControl_duplPair_ignore}" 
                                     Command="{Binding DataContext.ExecuteIgnorePairCommand, Source={x:Reference dummyElement}}"
                                     CommandParameter="{Binding}" >
-                                            <Image Source ="/AntiDuplWPF;component/Image/MistakeButton.png" MaxHeight="24" />
+                                            <Image Source ="/AntiDupl.NET.WPF;component/Image/MistakeButton.png" MaxHeight="24" />
                                         </Button>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
@@ -860,32 +860,32 @@
                                         ToolTip="{DynamicResource mainwindow_tooltip_Delete}"
                                         Background="{Binding Result/, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource deleteBackgroundValueConverter},
                                             ConverterParameter={x:Static objectModel:PositionInDuplPair.First}}">
-                                    <Image Source ="/AntiDuplWPF;component/Image/DeleteIcon16.png" MaxHeight="24" />
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/DeleteIcon16.png" MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{DynamicResource mainwindow_tooltip_MoveFirstToNeighbourDirectory}" 
                                     Command="{Binding MoveFirstToNeighbourDirectoryCommand}"
                                     CommandParameter="{Binding Result}" 
                                     Style="{StaticResource CollapsedButton}" >
-                                    <Image Source ="/AntiDuplWPF;component/Image/MoveFirstToSecondVerticalButton.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/MoveFirstToSecondVerticalButton.png" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{Binding RenameFirstLikeSecondText, Mode=OneWay}"
                                     Command="{Binding RenameFirstLikeSecondCommand}"
                                     CommandParameter="{Binding Result}" >
-                                    <Image Source ="/AntiDuplWPF;component/Image/AB.jpg" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/AB.jpg" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{DynamicResource mainwindow_tooltip_MoveAndRename}" 
                                     Command="{Binding MoveAndRenameCommand}"
                                     CommandParameter="{Binding Result}"
                                     Style="{StaticResource CollapsedButton}">
-                                    <Image Source ="/AntiDuplWPF;component/Image/MoveAndRenameSecondLikeFirstVertical.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/MoveAndRenameSecondLikeFirstVertical.png" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{DynamicResource mainwindow_tooltip_ReplaseNeighbour}"
                                     Command="{Binding ReplaseSecondCommand}"
                                     CommandParameter="{Binding Result}">
-                                    <Image Source ="/AntiDuplWPF;component/Image/ReplaceSecondVerticalButton.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/ReplaceSecondVerticalButton.png" 
                                            MaxHeight="24" />
                                 </Button>
                             </StackPanel>
@@ -893,7 +893,7 @@
                                     ToolTip="{DynamicResource mainwindow_tooltip_Ignore}" 
                                     Command="{Binding ExecuteIgnorePairCommand}" 
                                     CommandParameter="{Binding Result}" >
-                                <Image Source ="/AntiDuplWPF;component/Image/MistakeButton.png" 
+                                <Image Source ="/AntiDupl.NET.WPF;component/Image/MistakeButton.png" 
                                        MaxHeight="24" />
                             </Button>
 
@@ -904,26 +904,26 @@
                                     Command="{Binding MoveSecondToNeighbourDirectoryCommand}"
                                     CommandParameter="{Binding Result}" 
                                     Style="{StaticResource CollapsedButton}" >
-                                    <Image Source ="/AntiDuplWPF;component/Image/MoveSecondToFirstVerticalButton.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/MoveSecondToFirstVerticalButton.png" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{Binding RenameSecondLikeFirstText, Mode=OneWay}"
                                     Command="{Binding RenameSecondLikeFirstCommand}"
                                     CommandParameter="{Binding Result}" >
-                                    <Image Source ="/AntiDuplWPF;component/Image/AB.jpg" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/AB.jpg" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{DynamicResource mainwindow_tooltip_MoveAndRename}" 
                                     Command="{Binding MoveAndRenameCommand}"
                                     CommandParameter="{Binding Result}"
                                     Style="{StaticResource CollapsedButton}">
-                                    <Image Source ="/AntiDuplWPF;component/Image/MoveAndRenameSecondLikeFirstVertical.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/MoveAndRenameSecondLikeFirstVertical.png" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button ToolTip="{DynamicResource mainwindow_tooltip_ReplaseNeighbour}"
                                     Command="{Binding ReplaseFirstCommand}"
                                     CommandParameter="{Binding Result}" >
-                                    <Image Source ="/AntiDuplWPF;component/Image/ReplaceFirstVerticalButton.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/ReplaceFirstVerticalButton.png" 
                                            MaxHeight="24" />
                                 </Button>
                                 <Button Command="{Binding DeleteImageCommand}"
@@ -931,7 +931,7 @@
                                         ToolTip="{DynamicResource mainwindow_tooltip_Delete}" 
                                         Background="{Binding Result/, Converter={StaticResource deleteBackgroundValueConverter},
                                         ConverterParameter={x:Static objectModel:PositionInDuplPair.Second}}">
-                                    <Image Source ="/AntiDuplWPF;component/Image/DeleteIcon16.png" 
+                                    <Image Source ="/AntiDupl.NET.WPF;component/Image/DeleteIcon16.png" 
                                            MaxHeight="24" />
                                 </Button>
                             </StackPanel>
diff --git a/src/AntiDupl.NET.WPF/View/MainWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/MainWindow.xaml.cs
index c629534f..278db9aa 100644
--- a/src/AntiDupl.NET.WPF/View/MainWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     public partial class MainWindow
     {
diff --git a/src/AntiDupl.NET.WPF/View/PathWindow.xaml b/src/AntiDupl.NET.WPF/View/PathWindow.xaml
index 59d778a1..6c833629 100644
--- a/src/AntiDupl.NET.WPF/View/PathWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/PathWindow.xaml
@@ -1,8 +1,8 @@
-<Window x:Class="AntiDuplWPF.View.PathWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.PathWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:behavior="clr-namespace:AntiDuplWPF.Behavior"
+        xmlns:behavior="clr-namespace:AntiDupl.NET.WPF.Behavior"
         Title="PathWindow" Height="300" Width="300">
     <TabControl SelectedIndex="{Binding SelectedTabPageIndex, 
                                             Mode=TwoWay,
diff --git a/src/AntiDupl.NET.WPF/View/PathWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/PathWindow.xaml.cs
index 22160d35..2578305e 100644
--- a/src/AntiDupl.NET.WPF/View/PathWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/PathWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для PathWindow.xaml
diff --git a/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml b/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml
index af53e0ad..a8f3421a 100644
--- a/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml
+++ b/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml
@@ -1,8 +1,8 @@
-<Window x:Class="AntiDuplWPF.View.PrioritiesWindow"
+<Window x:Class="AntiDupl.NET.WPF.View.PrioritiesWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:control="clr-namespace:AntiDuplWPF.Control"
-        xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
+        xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
+        xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
         Title="PrioritiesWindow" Height="300" Width="300">
     <Window.Resources>
         <convertor:InverseBooleanConverter x:Key="inverseBooleanConverter"/>
diff --git a/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml.cs b/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml.cs
index 0a3ef41b..86e2348b 100644
--- a/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/PrioritiesWindow.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для PrioritiesWindow.xaml
diff --git a/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml b/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml
index 9626c604..50a1fa1b 100644
--- a/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml
+++ b/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml
@@ -1,7 +1,7 @@
-<Window x:Class="AntiDuplWPF.View.ProgressDialog"
+<Window x:Class="AntiDupl.NET.WPF.View.ProgressDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:AntiDuplWPF.Control"
+        xmlns:controls="clr-namespace:AntiDupl.NET.WPF.Control"
         Title="ProgressDialog" Height="100" Width="600" >
     <Grid >
         <Grid.ColumnDefinitions>
diff --git a/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml.cs b/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml.cs
index 86f26d1f..50c67c35 100644
--- a/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml.cs
+++ b/src/AntiDupl.NET.WPF/View/ProgressDialog.xaml.cs
@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     /// <summary>
     /// Логика взаимодействия для ProgressDialog.xaml
diff --git a/src/AntiDupl.NET.WPF/View/WindowService.cs b/src/AntiDupl.NET.WPF/View/WindowService.cs
index 82f00c02..815b23e6 100644
--- a/src/AntiDupl.NET.WPF/View/WindowService.cs
+++ b/src/AntiDupl.NET.WPF/View/WindowService.cs
@@ -4,9 +4,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.View
+namespace AntiDupl.NET.WPF.View
 {
     public class WindowService : IWindowService
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/BoolEventHandler.cs b/src/AntiDupl.NET.WPF/ViewModel/BoolEventHandler.cs
index cbe601f2..91c517ac 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/BoolEventHandler.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/BoolEventHandler.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class BoolEventHandler : EventArgs
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/CloseableViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/CloseableViewModel.cs
index 0f1879c7..f3c603ba 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/CloseableViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/CloseableViewModel.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
+using AntiDupl.NET.WPF.Command;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public abstract class CloseableViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/ColorViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/ColorViewModel.cs
index 1c680277..57ccaf57 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/ColorViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/ColorViewModel.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class ColorViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/ComparatorViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/ComparatorViewModel.cs
index f29003d1..a352b260 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/ComparatorViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/ComparatorViewModel.cs
@@ -8,14 +8,14 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.View;
-
-namespace AntiDuplWPF.ViewModel
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.View;
+
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class ComparatorViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/ConfigurableActionViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/ConfigurableActionViewModel.cs
index c4ed9c9c..b7e246b0 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/ConfigurableActionViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/ConfigurableActionViewModel.cs
@@ -7,21 +7,21 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ObjectModel.ActionGenerator;
-using AntiDuplWPF.ObjectModel.ByImageProperty;
-using AntiDuplWPF.ObjectModel.ByPath;
-using AntiDuplWPF.ObjectModel.ConditionMode;
-using AntiDuplWPF.ObjectModel.ConfigurableAction;
-using AntiDuplWPF.ObjectModel.DirectoryFilter;
-using AntiDuplWPF.ObjectModel.GettingNumber;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.View;
-
-namespace AntiDuplWPF.ViewModel
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel.ActionGenerator;
+using AntiDupl.NET.WPF.ObjectModel.ByImageProperty;
+using AntiDupl.NET.WPF.ObjectModel.ByPath;
+using AntiDupl.NET.WPF.ObjectModel.ConditionMode;
+using AntiDupl.NET.WPF.ObjectModel.ConfigurableAction;
+using AntiDupl.NET.WPF.ObjectModel.DirectoryFilter;
+using AntiDupl.NET.WPF.ObjectModel.GettingNumber;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.View;
+
+namespace AntiDupl.NET.WPF.ViewModel
 {
     class ConfigurableActionViewModel : CloseableViewModel
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/ConfigurationViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/ConfigurationViewModel.cs
index 5a0fed1f..aed72fb9 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/ConfigurationViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/ConfigurationViewModel.cs
@@ -6,15 +6,15 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.Service;
-using AntiDuplWPF.View;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.Service;
+using AntiDupl.NET.WPF.View;
 
 using AntiDupl.NET.Core;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class ConfigurationViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/DuplPairViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/DuplPairViewModel.cs
index 2194fb69..9e2fe12b 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/DuplPairViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/DuplPairViewModel.cs
@@ -5,16 +5,16 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ObjectModel.ConfigurableAction;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel.ConfigurableAction;
 using TinyIoC;
 
 using AntiDupl.NET.Core.Original;
 using AntiDupl.NET.Core;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     [Serializable]
     public class DuplPairViewModel
diff --git a/src/AntiDupl.NET.WPF/ViewModel/IClosingViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/IClosingViewModel.cs
index 356fe793..7a0fa49c 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/IClosingViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/IClosingViewModel.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public interface IClosingViewModel
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/LanguageViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/LanguageViewModel.cs
index b30c6ffe..c625c871 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/LanguageViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/LanguageViewModel.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public enum LanguageEnum
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/MainViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/MainViewModel.cs
index a4f22b3f..db4a9678 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/MainViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/MainViewModel.cs
@@ -12,20 +12,20 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.Service;
-using AntiDuplWPF.UndoRedo;
-using AntiDuplWPF.View;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.Service;
+using AntiDupl.NET.WPF.UndoRedo;
+using AntiDupl.NET.WPF.View;
 using Microsoft.Win32;
 using TinyIoC;
 
 using AntiDupl.NET.Core;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class MainViewModel : PropertyChangedBase
     {
@@ -808,7 +808,7 @@ private void LoadResults(string resPath)
                        throw;
                    }
 
-                   Title = String.Format("AntiDuplWPF - {0}", Path.GetFileNameWithoutExtension(Configuration.LastResultFile));
+                   Title = String.Format("AntiDupl.NET.WPF - {0}", Path.GetFileNameWithoutExtension(Configuration.LastResultFile));
                }
            })
             .ContinueWith(t =>
@@ -838,7 +838,7 @@ public ICommand SaveResultsCommand
                     {
                         SerializeHelper<DuplPairViewModel[]>.Save(_resultList.ToArray(), dialog.FileName);
                         Configuration.LastResultFile = dialog.FileName;
-                        Title = String.Format("AntiDuplWPF - {0}", Path.GetFileNameWithoutExtension(Configuration.LastResultFile));
+                        Title = String.Format("AntiDupl.NET.WPF - {0}", Path.GetFileNameWithoutExtension(Configuration.LastResultFile));
                     }
                 }, arg => _resultList != null && _resultList.Any()));
             }
@@ -1037,7 +1037,7 @@ public ICommand ReplaseSecondCommand
 
         #endregion
 
-        string _title = "AntiDuplWPF";
+        string _title = "AntiDupl.NET.WPF";
         public string Title
         {
             get
diff --git a/src/AntiDupl.NET.WPF/ViewModel/PathViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/PathViewModel.cs
index 049f1f88..c5f04ec4 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/PathViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/PathViewModel.cs
@@ -4,13 +4,13 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.DragDrop;
-using AntiDuplWPF.Model;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.DragDrop;
+using AntiDupl.NET.WPF.Model;
 using Microsoft.Win32;
 using Microsoft.WindowsAPICodePack.Dialogs;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     class PathViewModel : PropertyChangedBase, IDropable
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/PrioritiesViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/PrioritiesViewModel.cs
index f5cfab76..beffcbe3 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/PrioritiesViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/PrioritiesViewModel.cs
@@ -6,12 +6,12 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class PrioritiesViewModel : PropertyChangedBase, IClosingViewModel
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/ProgressDialogViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/ProgressDialogViewModel.cs
index 0cd87367..96a4d818 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/ProgressDialogViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/ProgressDialogViewModel.cs
@@ -8,10 +8,10 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Command;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Command;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class ProgressDialogViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/PropertyChangedBase.cs b/src/AntiDupl.NET.WPF/ViewModel/PropertyChangedBase.cs
index dca46b7d..bd293c55 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/PropertyChangedBase.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/PropertyChangedBase.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class PropertyChangedBase : INotifyPropertyChanged, INotifyPropertyChanging
     {
diff --git a/src/AntiDupl.NET.WPF/ViewModel/SearchPathViewModel.cs b/src/AntiDupl.NET.WPF/ViewModel/SearchPathViewModel.cs
index 5b2e13cc..74467903 100644
--- a/src/AntiDupl.NET.WPF/ViewModel/SearchPathViewModel.cs
+++ b/src/AntiDupl.NET.WPF/ViewModel/SearchPathViewModel.cs
@@ -4,12 +4,12 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Helper;
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.ViewModel
+namespace AntiDupl.NET.WPF.ViewModel
 {
     public class SearchPathViewModel : PropertyChangedBase
     {
diff --git a/src/AntiDupl.NET.WinForms/AntiDupl.NET.csproj b/src/AntiDupl.NET.WinForms/AntiDupl.NET.WinForms.csproj
similarity index 98%
rename from src/AntiDupl.NET.WinForms/AntiDupl.NET.csproj
rename to src/AntiDupl.NET.WinForms/AntiDupl.NET.WinForms.csproj
index f464ccbe..910fcf7e 100644
--- a/src/AntiDupl.NET.WinForms/AntiDupl.NET.csproj
+++ b/src/AntiDupl.NET.WinForms/AntiDupl.NET.WinForms.csproj
@@ -12,7 +12,7 @@
     <Copyright>ErmIg © 2002-2023</Copyright>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <StartupObject>AntiDupl.NET.Program</StartupObject>
+    <StartupObject>AntiDupl.NET.WinForms.Program</StartupObject>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/src/AntiDupl.NET.WinForms/BitmapWorker.cs b/src/AntiDupl.NET.WinForms/BitmapWorker.cs
index 8d8b758c..7469a1a7 100644
--- a/src/AntiDupl.NET.WinForms/BitmapWorker.cs
+++ b/src/AntiDupl.NET.WinForms/BitmapWorker.cs
@@ -5,7 +5,7 @@
 using AntiDupl.NET.Core.Enums;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public static class BitmapWorker
     {
diff --git a/src/AntiDupl.NET.WinForms/ClipboardContentBuilder.cs b/src/AntiDupl.NET.WinForms/ClipboardContentBuilder.cs
index 079c63bb..fdaec90e 100644
--- a/src/AntiDupl.NET.WinForms/ClipboardContentBuilder.cs
+++ b/src/AntiDupl.NET.WinForms/ClipboardContentBuilder.cs
@@ -28,10 +28,10 @@
 
 using AntiDupl.NET.Core;
 
-using TypeVertical = AntiDupl.NET.ResultsListView.ColumnsTypeVertical;
-using TypeHorizontal = AntiDupl.NET.ResultsListView.ColumnsTypeHorizontal;
+using TypeVertical = AntiDupl.NET.WinForms.ResultsListView.ColumnsTypeVertical;
+using TypeHorizontal = AntiDupl.NET.WinForms.ResultsListView.ColumnsTypeHorizontal;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ClipboardContentBuilder
     {
diff --git a/src/AntiDupl.NET.WinForms/ComparableBitmap.cs b/src/AntiDupl.NET.WinForms/ComparableBitmap.cs
index 9506a84d..e2ff6c4b 100644
--- a/src/AntiDupl.NET.WinForms/ComparableBitmap.cs
+++ b/src/AntiDupl.NET.WinForms/ComparableBitmap.cs
@@ -25,7 +25,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ComparableBitmap
     {
diff --git a/src/AntiDupl.NET.WinForms/Comparator.cs b/src/AntiDupl.NET.WinForms/Comparator.cs
index 5ff3ee2d..fb146924 100644
--- a/src/AntiDupl.NET.WinForms/Comparator.cs
+++ b/src/AntiDupl.NET.WinForms/Comparator.cs
@@ -23,7 +23,7 @@
 */
 using System;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     class Comparator
     {
diff --git a/src/AntiDupl.NET.WinForms/CoreOptions.cs b/src/AntiDupl.NET.WinForms/CoreOptions.cs
index 7e9a86ce..57a943b3 100644
--- a/src/AntiDupl.NET.WinForms/CoreOptions.cs
+++ b/src/AntiDupl.NET.WinForms/CoreOptions.cs
@@ -31,7 +31,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class CoreOptions
     {
diff --git a/src/AntiDupl.NET.WinForms/DataGridViewCustomRow.cs b/src/AntiDupl.NET.WinForms/DataGridViewCustomRow.cs
index d258af5f..b4fffb7a 100644
--- a/src/AntiDupl.NET.WinForms/DataGridViewCustomRow.cs
+++ b/src/AntiDupl.NET.WinForms/DataGridViewCustomRow.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.ComponentModel;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class DataGridViewCustomRow : DataGridViewRow
     {
diff --git a/src/AntiDupl.NET.WinForms/DataGridViewDoubleTextBoxCell.cs b/src/AntiDupl.NET.WinForms/DataGridViewDoubleTextBoxCell.cs
index 7dd25119..146d58d5 100644
--- a/src/AntiDupl.NET.WinForms/DataGridViewDoubleTextBoxCell.cs
+++ b/src/AntiDupl.NET.WinForms/DataGridViewDoubleTextBoxCell.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.ComponentModel;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class DataGridViewDoubleTextBoxCell : DataGridViewTextBoxCell
     {
diff --git a/src/AntiDupl.NET.WinForms/FolderOpener.cs b/src/AntiDupl.NET.WinForms/FolderOpener.cs
index 603fd314..fca0dd3b 100644
--- a/src/AntiDupl.NET.WinForms/FolderOpener.cs
+++ b/src/AntiDupl.NET.WinForms/FolderOpener.cs
@@ -32,7 +32,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static public class FolderOpener
     {
diff --git a/src/AntiDupl.NET.WinForms/FolderPicker.cs b/src/AntiDupl.NET.WinForms/FolderPicker.cs
index 41b3b8ff..a9cb92e2 100644
--- a/src/AntiDupl.NET.WinForms/FolderPicker.cs
+++ b/src/AntiDupl.NET.WinForms/FolderPicker.cs
@@ -31,7 +31,7 @@
 //using System.Windows; // for WPF support
 //using System.Windows.Interop;  // for WPF support
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class FolderPicker
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs b/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs
index 369d4179..57c29cb2 100644
--- a/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/AboutProgramForm.cs
@@ -29,7 +29,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Enums;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class AboutProgramForm : Form
     {
@@ -47,7 +47,7 @@ public AboutProgramForm(CoreLib core)
 
         private void InitializeComponent()
         {
-            ClientSize = new System.Drawing.Size(310, 350);
+            ClientSize = new System.Drawing.Size(350, 350);
             FormBorderStyle = FormBorderStyle.FixedDialog;
             StartPosition = FormStartPosition.CenterScreen;
             ShowInTaskbar = false;
diff --git a/src/AntiDupl.NET.WinForms/Form/CoreOptionsForm.cs b/src/AntiDupl.NET.WinForms/Form/CoreOptionsForm.cs
index 573d79d6..c040fcbe 100644
--- a/src/AntiDupl.NET.WinForms/Form/CoreOptionsForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/CoreOptionsForm.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core.Original;
 using AntiDupl.NET.Core.Enums;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class CoreOptionsForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/CorePathsForm.cs b/src/AntiDupl.NET.WinForms/Form/CorePathsForm.cs
index 574fc9f4..7d66da74 100644
--- a/src/AntiDupl.NET.WinForms/Form/CorePathsForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/CorePathsForm.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class CorePathsForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/MainForm.cs b/src/AntiDupl.NET.WinForms/Form/MainForm.cs
index 75f63322..4d74614d 100644
--- a/src/AntiDupl.NET.WinForms/Form/MainForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/MainForm.cs
@@ -35,7 +35,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class MainForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/ProgressForm.cs b/src/AntiDupl.NET.WinForms/Form/ProgressForm.cs
index 8165df1f..270df00d 100644
--- a/src/AntiDupl.NET.WinForms/Form/ProgressForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/ProgressForm.cs
@@ -30,7 +30,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Форма отображает прогресс длительных операций.
diff --git a/src/AntiDupl.NET.WinForms/Form/SearchExecuterForm.cs b/src/AntiDupl.NET.WinForms/Form/SearchExecuterForm.cs
index 666d6303..831e5c97 100644
--- a/src/AntiDupl.NET.WinForms/Form/SearchExecuterForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/SearchExecuterForm.cs
@@ -35,7 +35,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class SearchExecuterForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/SelectHorizontalColumnsForm.cs b/src/AntiDupl.NET.WinForms/Form/SelectHorizontalColumnsForm.cs
index c9724998..2eb611fb 100644
--- a/src/AntiDupl.NET.WinForms/Form/SelectHorizontalColumnsForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/SelectHorizontalColumnsForm.cs
@@ -28,7 +28,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class SelectHorizontalColumnsForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/SelectHotKeysForm.cs b/src/AntiDupl.NET.WinForms/Form/SelectHotKeysForm.cs
index e98ebd96..07f71709 100644
--- a/src/AntiDupl.NET.WinForms/Form/SelectHotKeysForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/SelectHotKeysForm.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class SelectHotKeysForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/SelectVerticalColumnsForm.cs b/src/AntiDupl.NET.WinForms/Form/SelectVerticalColumnsForm.cs
index 2f9ed76f..deca47e6 100644
--- a/src/AntiDupl.NET.WinForms/Form/SelectVerticalColumnsForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/SelectVerticalColumnsForm.cs
@@ -28,7 +28,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class SelectVerticalColumnsForm : Form
     {
diff --git a/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs b/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs
index 23a68aef..1baf6c62 100644
--- a/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs
+++ b/src/AntiDupl.NET.WinForms/Form/StartFinishForm.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class StartFinishForm : Form
     {
@@ -71,7 +71,7 @@ public StartFinishForm(CoreLib core, Options options)
 
         private void InitializeComponent()
         {
-            ClientSize = new System.Drawing.Size(310, 310);
+            ClientSize = new System.Drawing.Size(330, 310);
             FormBorderStyle = FormBorderStyle.FixedDialog;
             StartPosition = FormStartPosition.CenterScreen;
             ShowInTaskbar = false;
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs
index b08eb711..1a8cc031 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/AboutProgramPanel.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class AboutProgramPanel : Panel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ComplexProgressBar.cs b/src/AntiDupl.NET.WinForms/GUIControl/ComplexProgressBar.cs
index 224f59cf..7d4c297f 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ComplexProgressBar.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ComplexProgressBar.cs
@@ -29,7 +29,7 @@
 using System.ComponentModel;
 using System.Collections.ObjectModel;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ComplexProgressBar : ProgressBar
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewContextMenu.cs b/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewContextMenu.cs
index 93e464b7..ab5fd5e3 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewContextMenu.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewContextMenu.cs
@@ -33,7 +33,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ImagePreviewContextMenu : ContextMenuStrip
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewPanel.cs
index a50f8c04..4943c7d5 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ImagePreviewPanel.cs
@@ -33,7 +33,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ImagePreviewPanel : TableLayoutPanel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/LabeledComboBox.cs b/src/AntiDupl.NET.WinForms/GUIControl/LabeledComboBox.cs
index d1822b65..b4ff1ae5 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/LabeledComboBox.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/LabeledComboBox.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class LabeledComboBox : TableLayoutPanel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/LabeledIntegerEdit.cs b/src/AntiDupl.NET.WinForms/GUIControl/LabeledIntegerEdit.cs
index af7f0c0e..2c1f0718 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/LabeledIntegerEdit.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/LabeledIntegerEdit.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class LabeledIntegerEdit : TableLayoutPanel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/LabeledNumericUpDown.cs b/src/AntiDupl.NET.WinForms/GUIControl/LabeledNumericUpDown.cs
index c48a37b2..d3a35bb8 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/LabeledNumericUpDown.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/LabeledNumericUpDown.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// NumericUpDown с подписью.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/LanguageMenuItem.cs b/src/AntiDupl.NET.WinForms/GUIControl/LanguageMenuItem.cs
index 1585d2e8..ca46b5ae 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/LanguageMenuItem.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/LanguageMenuItem.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class LanguageMenuItem : ToolStripMenuItem
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/MainMenu.cs b/src/AntiDupl.NET.WinForms/GUIControl/MainMenu.cs
index a2b02312..242fc64a 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/MainMenu.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/MainMenu.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class MainMenu : MenuStrip
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/MainSplitContainer.cs b/src/AntiDupl.NET.WinForms/GUIControl/MainSplitContainer.cs
index 46135dfa..15f1a70a 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/MainSplitContainer.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/MainSplitContainer.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Две панели, разделенные подвижной строкой: таблицы и превью.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/MainStatusStrip.cs b/src/AntiDupl.NET.WinForms/GUIControl/MainStatusStrip.cs
index db913a53..c8cc2620 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/MainStatusStrip.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/MainStatusStrip.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     class MainStatusStrip : StatusStrip
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/MainToolStrip.cs b/src/AntiDupl.NET.WinForms/GUIControl/MainToolStrip.cs
index 34aff341..7f49b261 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/MainToolStrip.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/MainToolStrip.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core.Original;
 using AntiDupl.NET.Core.Enums;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Главная панель инструментов.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/NewVersionMenuItem.cs b/src/AntiDupl.NET.WinForms/GUIControl/NewVersionMenuItem.cs
index 699f4eaf..d209bbe6 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/NewVersionMenuItem.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/NewVersionMenuItem.cs
@@ -30,7 +30,9 @@
 using System.IO;
 using System.Threading;
 
-namespace AntiDupl.NET
+using Version = AntiDupl.NET.Core.Version;
+
+namespace AntiDupl.NET.WinForms
 {
     public class NewVersionMenuItem : ToolStripMenuItem
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/PictureBoxPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/PictureBoxPanel.cs
index 7e68c757..3555d8fa 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/PictureBoxPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/PictureBoxPanel.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class PictureBoxPanel : Panel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ProgressPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/ProgressPanel.cs
index a140b11a..164c5f0d 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ProgressPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ProgressPanel.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.ComponentModel;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ProgressPanel : Panel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/RaisedPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/RaisedPanel.cs
index 68258736..7c63c94c 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/RaisedPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/RaisedPanel.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class RaisedPanel : Panel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsListView.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsListView.cs
index 1566ca22..eca29a72 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsListView.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsListView.cs
@@ -32,7 +32,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Class output result in ListView.
@@ -90,7 +90,7 @@ public enum ColumnsTypeHorizontal
 
         private MainSplitContainer m_mainSplitContainer;
         private CoreLib m_core;
-        private AntiDupl.NET.Options m_options;
+        private AntiDupl.NET.WinForms.Options m_options;
         public CoreOptions CoreOptions { get { return m_coreOptions; } } 
         private CoreOptions m_coreOptions;
         private CoreResult[] m_results;
@@ -134,7 +134,7 @@ private int HigherDragSelectedRowIndex
             }
         }
 
-        public ResultsListView(CoreLib core, AntiDupl.NET.Options options, CoreOptions coreOptions, MainSplitContainer mainSplitContainer)
+        public ResultsListView(CoreLib core, AntiDupl.NET.WinForms.Options options, CoreOptions coreOptions, MainSplitContainer mainSplitContainer)
         {
             m_core = core;
             m_options = options;
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsListViewContextMenu.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsListViewContextMenu.cs
index 95ef8a67..ffc369f3 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsListViewContextMenu.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsListViewContextMenu.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Контекстное меню для списка дубликатов.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewBase.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewBase.cs
index cec2bdef..87094a2c 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewBase.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewBase.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public abstract class ResultsPreviewBase : Panel
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewContainer.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewContainer.cs
index e43ab7b7..cfb44207 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewContainer.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewContainer.cs
@@ -30,7 +30,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель содеражшая или превью дефекта или дубликатов.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDefect.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDefect.cs
index b475f111..7a081264 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDefect.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDefect.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель которая включает в себя панель с просмотра изображеня и панель инструментов для работы с дефектными изображенями.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDuplPair.cs b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDuplPair.cs
index 2e4e8456..f2e5eea1 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDuplPair.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ResultsPreviewDuplPair.cs
@@ -33,7 +33,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель которая включает в себя две панели с просмотра изображений и панель инструментов для работы с дубликатами изображений.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupPanel.cs
index 822270f8..2724404d 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupPanel.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель содержит панели изображений одной группы.
@@ -38,7 +38,7 @@ public class ThumbnailGroupPanel : RaisedPanel
     {
         private CoreLib m_core;
         private CoreGroup m_group;
-        private AntiDupl.NET.Options m_options;
+        private AntiDupl.NET.WinForms.Options m_options;
 
         private ThumbnailPanel[] m_thumbnailPanels;
         public ThumbnailPanel[] ThumbnailPanels { get { return m_thumbnailPanels; } }
@@ -46,7 +46,7 @@ public class ThumbnailGroupPanel : RaisedPanel
         private ThumbnailGroupTable m_thumbnailGroupTable;
         public ThumbnailGroupTable Table { get { return m_thumbnailGroupTable; } }
 
-        public ThumbnailGroupPanel(CoreLib core, AntiDupl.NET.Options options, CoreGroup group, ThumbnailGroupTable thumbnailGroupTable)
+        public ThumbnailGroupPanel(CoreLib core, AntiDupl.NET.WinForms.Options options, CoreGroup group, ThumbnailGroupTable thumbnailGroupTable)
         {
             m_core = core;
             m_options = options;
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupTable.cs b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupTable.cs
index 5c3aa81a..0a4fdf4d 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupTable.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailGroupTable.cs
@@ -30,7 +30,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Таблица групп.
@@ -38,7 +38,7 @@ namespace AntiDupl.NET
     public class ThumbnailGroupTable : Panel
     {
         private CoreLib m_core;
-        private AntiDupl.NET.Options m_options;
+        private AntiDupl.NET.WinForms.Options m_options;
         private CoreGroup[] m_groups;
         private int m_maxGroupIndex = -1;
         private MainSplitContainer m_mainSplitContainer;
@@ -54,7 +54,7 @@ public class ThumbnailGroupTable : Panel
         public delegate void CurrentThumbnailChangedHandler(CoreGroup group, int index);
         public event CurrentThumbnailChangedHandler OnCurrentThumbnailChanged;
 
-        public ThumbnailGroupTable(CoreLib core, AntiDupl.NET.Options options, MainSplitContainer mainSplitContainer)
+        public ThumbnailGroupTable(CoreLib core, AntiDupl.NET.WinForms.Options options, MainSplitContainer mainSplitContainer)
         {
             m_core = core;
             m_options = options;
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPanel.cs b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPanel.cs
index b7bada93..f864a60b 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPanel.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPanel.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель одного изображения и информации о нем, checkbox.
@@ -44,7 +44,7 @@ public class ThumbnailPanel :  RaisedPanel
         private CoreLib m_core;
         private CoreGroup m_group;
         private int m_index;
-        private AntiDupl.NET.Options m_options;
+        private AntiDupl.NET.WinForms.Options m_options;
         private ThumbnailGroupPanel m_thumbnailGroupPanel;
 
         private TableLayoutPanel m_mainLayout;
@@ -82,7 +82,7 @@ public Bitmap Thumbnail
 
         public CoreImageInfo ImageInfo { get { return m_group.images[m_index]; } }
 
-        public ThumbnailPanel(CoreLib core, AntiDupl.NET.Options options, CoreGroup group, int index, ThumbnailGroupPanel thumbnailGroupPanel)
+        public ThumbnailPanel(CoreLib core, AntiDupl.NET.WinForms.Options options, CoreGroup group, int index, ThumbnailGroupPanel thumbnailGroupPanel)
         {
             m_core = core;
             m_options = options;
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreview.cs b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreview.cs
index cc4ee548..dec64557 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreview.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreview.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Панель превью изображения.
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreviewContextMenu.cs b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreviewContextMenu.cs
index 402cba4a..9f7916b4 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreviewContextMenu.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ThumbnailPreviewContextMenu.cs
@@ -32,7 +32,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ThumbnailPreviewContextMenu : ContextMenuStrip
     {
diff --git a/src/AntiDupl.NET.WinForms/GUIControl/ViewModeMenuItem.cs b/src/AntiDupl.NET.WinForms/GUIControl/ViewModeMenuItem.cs
index 686abea0..16ed91e7 100644
--- a/src/AntiDupl.NET.WinForms/GUIControl/ViewModeMenuItem.cs
+++ b/src/AntiDupl.NET.WinForms/GUIControl/ViewModeMenuItem.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class ViewModeMenuItem : ToolStripMenuItem
     {
@@ -47,7 +47,7 @@ public ViewModeMenuItem(Options options)
             UpdateStrings();
             UpdateIcons(m_options.resultsOptions.viewMode);
             Resources.Strings.OnCurrentChange += new Resources.Strings.CurrentChangeHandler(UpdateStrings);
-            m_options.resultsOptions.OnViewModeChange += new AntiDupl.NET.ResultsOptions.ViewModeChangeHandler(UpdateIcons);
+            m_options.resultsOptions.OnViewModeChange += new AntiDupl.NET.WinForms.ResultsOptions.ViewModeChangeHandler(UpdateIcons);
         }
 
         private void InitializeComponents()
diff --git a/src/AntiDupl.NET.WinForms/HotKeyOptions.cs b/src/AntiDupl.NET.WinForms/HotKeyOptions.cs
index 6a6f5bd8..195c2bdd 100644
--- a/src/AntiDupl.NET.WinForms/HotKeyOptions.cs
+++ b/src/AntiDupl.NET.WinForms/HotKeyOptions.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class HotKeyOptions
     {
diff --git a/src/AntiDupl.NET.WinForms/ImageOpener.cs b/src/AntiDupl.NET.WinForms/ImageOpener.cs
index e9f3ef42..a478da36 100644
--- a/src/AntiDupl.NET.WinForms/ImageOpener.cs
+++ b/src/AntiDupl.NET.WinForms/ImageOpener.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static public class ImageOpener
     {
diff --git a/src/AntiDupl.NET.WinForms/InitFactory.cs b/src/AntiDupl.NET.WinForms/InitFactory.cs
index 13007069..a8d6d457 100644
--- a/src/AntiDupl.NET.WinForms/InitFactory.cs
+++ b/src/AntiDupl.NET.WinForms/InitFactory.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Фабрика создает элементы GUI
diff --git a/src/AntiDupl.NET.WinForms/MainFormOptions.cs b/src/AntiDupl.NET.WinForms/MainFormOptions.cs
index 42ae276a..72ba793d 100644
--- a/src/AntiDupl.NET.WinForms/MainFormOptions.cs
+++ b/src/AntiDupl.NET.WinForms/MainFormOptions.cs
@@ -27,7 +27,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class MainFormOptions
     {
diff --git a/src/AntiDupl.NET.WinForms/Options.cs b/src/AntiDupl.NET.WinForms/Options.cs
index 81cf1fe9..9103fdac 100644
--- a/src/AntiDupl.NET.WinForms/Options.cs
+++ b/src/AntiDupl.NET.WinForms/Options.cs
@@ -29,7 +29,7 @@
 using System.IO;
 using System.Windows.Forms;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class Options
     {
diff --git a/src/AntiDupl.NET.WinForms/Program.cs b/src/AntiDupl.NET.WinForms/Program.cs
index f066bc32..635a0a3c 100644
--- a/src/AntiDupl.NET.WinForms/Program.cs
+++ b/src/AntiDupl.NET.WinForms/Program.cs
@@ -26,7 +26,7 @@
 using System.Windows.Forms;
 using System.IO;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static class Program
     {
diff --git a/src/AntiDupl.NET.WinForms/ProgressUtils.cs b/src/AntiDupl.NET.WinForms/ProgressUtils.cs
index 0337f74f..02d6027e 100644
--- a/src/AntiDupl.NET.WinForms/ProgressUtils.cs
+++ b/src/AntiDupl.NET.WinForms/ProgressUtils.cs
@@ -25,7 +25,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public static class ProgressUtils
     {
diff --git a/src/AntiDupl.NET.WinForms/Properties/Settings.Designer.cs b/src/AntiDupl.NET.WinForms/Properties/Settings.Designer.cs
index e25ec3b1..87730295 100644
--- a/src/AntiDupl.NET.WinForms/Properties/Settings.Designer.cs
+++ b/src/AntiDupl.NET.WinForms/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AntiDupl.NET.Properties {
+namespace AntiDupl.NET.WinForms.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/src/AntiDupl.NET.WinForms/Resources.cs b/src/AntiDupl.NET.WinForms/Resources.cs
index 21713463..7dc36c1b 100644
--- a/src/AntiDupl.NET.WinForms/Resources.cs
+++ b/src/AntiDupl.NET.WinForms/Resources.cs
@@ -33,7 +33,7 @@
 using System.Diagnostics;
 using System.ComponentModel;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static public class Resources
     {
@@ -167,7 +167,7 @@ static public void Initialize()
                     FileInfo[] fileInfos = directoryInfo.GetFiles(Filter, SearchOption.TopDirectoryOnly);
                     for (int i = 0; i < fileInfos.Length; i++)
                     {
-                        AntiDupl.NET.Strings strings = Load(fileInfos[i].FullName);
+                        AntiDupl.NET.WinForms.Strings strings = Load(fileInfos[i].FullName);
                         if(strings != null)
                         {
                             string name = System.IO.Path.GetFileNameWithoutExtension(fileInfos[i].FullName);
@@ -192,16 +192,16 @@ static public void Initialize()
                 }
             }
             
-            static private AntiDupl.NET.Strings Load(string path)
+            static private AntiDupl.NET.WinForms.Strings Load(string path)
             {
                 FileInfo fileInfo = new FileInfo(path);
                 if (fileInfo.Exists)
                 {
                     try
                     {
-                        XmlSerializer xmlSerializer = new XmlSerializer(typeof(AntiDupl.NET.Strings));
+                        XmlSerializer xmlSerializer = new XmlSerializer(typeof(AntiDupl.NET.WinForms.Strings));
                         FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-                        AntiDupl.NET.Strings strings = (AntiDupl.NET.Strings)xmlSerializer.Deserialize(fileStream);
+                        AntiDupl.NET.WinForms.Strings strings = (AntiDupl.NET.WinForms.Strings)xmlSerializer.Deserialize(fileStream);
                         fileStream.Close();
                         return strings;
                     }
@@ -214,13 +214,13 @@ static private AntiDupl.NET.Strings Load(string path)
                     return null;
             }
 
-            static private void Save(AntiDupl.NET.Strings strings)
+            static private void Save(AntiDupl.NET.WinForms.Strings strings)
             {
                 try
                 {
 
                     TextWriter writer = new StreamWriter(GetPath(Path, strings.Name, Extension));
-                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(AntiDupl.NET.Strings));
+                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(AntiDupl.NET.WinForms.Strings));
                     xmlSerializer.Serialize(writer, strings);
                     writer.Close();
                 }
@@ -251,21 +251,21 @@ public static int CurrentIndex
                 }
             }
             
-            public static AntiDupl.NET.Strings Current
+            public static AntiDupl.NET.WinForms.Strings Current
             {
                 get 
                 {
                     if (m_currentIndex < Count && m_currentIndex >= 0)
-                        return (AntiDupl.NET.Strings)m_strings[m_currentIndex];
+                        return (AntiDupl.NET.WinForms.Strings)m_strings[m_currentIndex];
                     else
                         return null; 
                 }
             }
             
-            public static AntiDupl.NET.Strings Get(int index)
+            public static AntiDupl.NET.WinForms.Strings Get(int index)
             {
                 if (index < Count && index >= 0)
-                    return (AntiDupl.NET.Strings)m_strings[index];
+                    return (AntiDupl.NET.WinForms.Strings)m_strings[index];
                 else
                     return null;
             }
diff --git a/src/AntiDupl.NET.WinForms/ResultRowSetter.cs b/src/AntiDupl.NET.WinForms/ResultRowSetter.cs
index 1e3bb291..e5f7d294 100644
--- a/src/AntiDupl.NET.WinForms/ResultRowSetter.cs
+++ b/src/AntiDupl.NET.WinForms/ResultRowSetter.cs
@@ -31,7 +31,7 @@
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Set table of out defect and dublicate pair.
@@ -39,7 +39,7 @@ namespace AntiDupl.NET
     /// </summary>
     public class ResultRowSetter
     {
-        private AntiDupl.NET.Options m_options;
+        private AntiDupl.NET.WinForms.Options m_options;
         private DataGridView m_dataGridView;
 
         private Image m_nullIcon;
@@ -96,7 +96,7 @@ public class ResultRowSetter
         private string m_mirrorTurn_180_IconToolTipText;
         private string m_mirrorTurn_270_IconToolTipText;
 
-        public ResultRowSetter(AntiDupl.NET.Options options, DataGridView dataGridView)
+        public ResultRowSetter(AntiDupl.NET.WinForms.Options options, DataGridView dataGridView)
         {
             m_options = options;
             m_dataGridView = dataGridView;
diff --git a/src/AntiDupl.NET.WinForms/ResultsOptions.cs b/src/AntiDupl.NET.WinForms/ResultsOptions.cs
index e19c1cc7..f72e3060 100644
--- a/src/AntiDupl.NET.WinForms/ResultsOptions.cs
+++ b/src/AntiDupl.NET.WinForms/ResultsOptions.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Setting for table out (ListView).
diff --git a/src/AntiDupl.NET.WinForms/Strings.cs b/src/AntiDupl.NET.WinForms/Strings.cs
index 3b41d73a..75f95a56 100644
--- a/src/AntiDupl.NET.WinForms/Strings.cs
+++ b/src/AntiDupl.NET.WinForms/Strings.cs
@@ -25,7 +25,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     public class Strings
     {
diff --git a/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs b/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs
index 244ae4ee..388a8d5e 100644
--- a/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs
+++ b/src/AntiDupl.NET.WinForms/StringsDefaultEnglish.cs
@@ -25,7 +25,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static public class StringsDefaultEnglish
     {
diff --git a/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs b/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs
index 3c0a688f..b67496b5 100644
--- a/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs
+++ b/src/AntiDupl.NET.WinForms/StringsDefaultRussian.cs
@@ -25,7 +25,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     static public class StringsDefaultRussian
     {
diff --git a/src/AntiDupl.NET.WinForms/ThumbnailStorage.cs b/src/AntiDupl.NET.WinForms/ThumbnailStorage.cs
index 29043b9b..e999979a 100644
--- a/src/AntiDupl.NET.WinForms/ThumbnailStorage.cs
+++ b/src/AntiDupl.NET.WinForms/ThumbnailStorage.cs
@@ -29,7 +29,7 @@
 
 using AntiDupl.NET.Core;
 
-namespace AntiDupl.NET
+namespace AntiDupl.NET.WinForms
 {
     /// <summary>
     /// Хранилище эскизов изображений.
diff --git a/src/AntiDupl.sln b/src/AntiDupl.sln
index bf674357..3924cd1c 100644
--- a/src/AntiDupl.sln
+++ b/src/AntiDupl.sln
@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32526.322
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntiDupl64", "AntiDupl\AntiDupl64.vcxproj", "{064909D6-CA38-45EA-ABC8-9DF202E600C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntiDupl", "AntiDupl\AntiDupl.vcxproj", "{064909D6-CA38-45EA-ABC8-9DF202E600C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET.WinForms", "AntiDupl.NET.WinForms\AntiDupl.NET.csproj", "{5E3F8B85-9C79-4EA1-90E3-BD5C84CBA820}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET.WinForms", "AntiDupl.NET.WinForms\AntiDupl.NET.WinForms.csproj", "{5E3F8B85-9C79-4EA1-90E3-BD5C84CBA820}"
 	ProjectSection(ProjectDependencies) = postProject
-		{064909D6-CA38-45EA-ABC8-9DF202E600C9} = {064909D6-CA38-45EA-ABC8-9DF202E600C9}
 		{8F2134F7-2163-4B0B-8C79-801631116565} = {8F2134F7-2163-4B0B-8C79-801631116565}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET.Core", "AntiDupl.NET.Core\AntiDupl.NET.Core.csproj", "{8F2134F7-2163-4B0B-8C79-801631116565}"
+	ProjectSection(ProjectDependencies) = postProject
+		{064909D6-CA38-45EA-ABC8-9DF202E600C9} = {064909D6-CA38-45EA-ABC8-9DF202E600C9}
+	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET.WPF", "AntiDupl.NET.WPF\AntiDuplWPF.csproj", "{45E650C2-2508-4897-9A7F-3EA583FC9243}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET.WPF", "AntiDupl.NET.WPF\AntiDupl.NET.WPF.csproj", "{45E650C2-2508-4897-9A7F-3EA583FC9243}"
 	ProjectSection(ProjectDependencies) = postProject
 		{064909D6-CA38-45EA-ABC8-9DF202E600C9} = {064909D6-CA38-45EA-ABC8-9DF202E600C9}
 		{8F2134F7-2163-4B0B-8C79-801631116565} = {8F2134F7-2163-4B0B-8C79-801631116565}
diff --git a/src/AntiDupl/AntiDupl64.vcxproj b/src/AntiDupl/AntiDupl.vcxproj
similarity index 100%
rename from src/AntiDupl/AntiDupl64.vcxproj
rename to src/AntiDupl/AntiDupl.vcxproj
diff --git a/src/AntiDupl/AntiDupl64.vcxproj.filters b/src/AntiDupl/AntiDupl.vcxproj.filters
similarity index 100%
rename from src/AntiDupl/AntiDupl64.vcxproj.filters
rename to src/AntiDupl/AntiDupl.vcxproj.filters