diff --git a/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems b/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
index 719479e..91d28e4 100644
--- a/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
+++ b/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
@@ -13,15 +13,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\AuthConfig.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\AuthConfig.UWP.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\WindowsAuthenticationBroker.UWP.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ClipboardBehaviorBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\CopyToClipboardBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\DialogBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\FileBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ItemClickCommandBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ListViewItemClickBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ObjectToFileBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\PasteFromClipboardBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\TreeViewItemInvokeBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\UITools.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseUserControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\RichTextEditor.cs" />
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/ClipboardBehaviorBase.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/ClipboardBehaviorBase.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/CopyToClipboardBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/CopyToClipboardBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/DialogBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/DialogBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/FileBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/FileBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/ItemClickCommandBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/ItemClickCommandBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/ListViewItemClickBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/ListViewItemClickBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/ObjectToFileBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/ObjectToFileBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/PasteFromClipboardBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/PasteFromClipboardBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Behaviors/TreeViewItemInvokeBehavior.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
index e9f49eb..9c2aa2f 100644
--- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
+++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
@@ -9,6 +9,15 @@
     <Import_RootNamespace>Eppie.App.UI</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ClipboardBehaviorBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\CopyToClipboardBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\DialogBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\FileBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ItemClickCommandBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ListViewItemClickBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ObjectToFileBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\PasteFromClipboardBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behaviors\TreeViewItemInvokeBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BitmapSourceConverters.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BoolToValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\ConverterChain.cs" />
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
index f1843ff..f636b07 100644
--- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
+++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
@@ -125,12 +125,18 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.UI.Xaml" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Entities\Tuvi.Core.Entities.csproj">
       <Project>{1e363987-165e-4ea6-a0e1-fad82b7c0633}</Project>
       <Name>Tuvi.Core.Entities</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Eppie.App.ViewModels\Eppie.App.ViewModels.csproj">
+      <Project>{2da63e2a-a0ac-4c55-b912-04d8970bced3}</Project>
+      <Name>Eppie.App.ViewModels</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="..\Eppie.App.UI.Shared\Eppie.App.UI.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj
index 9320063..ba8d31a 100644
--- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj
+++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj
@@ -41,5 +41,15 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Entities\Tuvi.Core.Entities.csproj" />
+    <ProjectReference Include="..\..\Eppie.App.ViewModels\Eppie.App.ViewModels.csproj" />
   </ItemGroup>
+
+  <!-- https://github.com/unoplatform/Uno.XamlBehaviors?tab=readme-ov-file#uno-platform-port-of-xaml-behaviors -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041'">
+    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0-windows10.0.19041'">
+    <PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/source/Eppie.App/Eppie.App.sln b/source/Eppie.App/Eppie.App.sln
index 99a88e1..c6fcfae 100644
--- a/source/Eppie.App/Eppie.App.sln
+++ b/source/Eppie.App/Eppie.App.sln
@@ -791,8 +791,8 @@ Global
 		{E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x64.Build.0 = Release|Any CPU
 		{E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x86.ActiveCfg = Release|Any CPU
 		{E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x86.Build.0 = Release|Any CPU
-		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.Build.0 = Debug|x64
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM.Build.0 = Debug|ARM
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -801,8 +801,8 @@ Global
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x64.Build.0 = Debug|x64
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x86.ActiveCfg = Debug|x86
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x86.Build.0 = Debug|x86
-		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.ActiveCfg = Release|x64
+		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.Build.0 = Release|x64
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM.ActiveCfg = Release|ARM
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM.Build.0 = Release|ARM
 		{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM64.ActiveCfg = Release|ARM64