diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5135af0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.exe filter=lfs diff=lfs merge=lfs -text
diff --git a/VDownload.Common/Playlist.cs b/VDownload.Common/Playlist.cs
deleted file mode 100644
index 203be1d..0000000
--- a/VDownload.Common/Playlist.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common.Models;
-
-namespace VDownload.Common
-{
-    public abstract class Playlist : ObservableObject, IEnumerable<Video>
-    {
-        public IEnumerator<Video> GetEnumerator()
-        {
-            throw new NotImplementedException();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/VDownload.Common/Services/ISourceSearchService.cs b/VDownload.Common/Services/ISourceSearchService.cs
deleted file mode 100644
index 0d5d003..0000000
--- a/VDownload.Common/Services/ISourceSearchService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common.Models;
-
-namespace VDownload.Common.Services
-{
-    public interface ISourceSearchService
-    {
-        Task<Video> SearchVideo(string url);
-        Task<Playlist> SearchPlaylist(string url, int maxVideoCount);
-    }
-}
diff --git a/VDownload.Common/Video.cs b/VDownload.Common/Video.cs
deleted file mode 100644
index 57c3e1f..0000000
--- a/VDownload.Common/Video.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Common.Models
-{
-    public abstract partial class Video : ObservableObject
-    {
-        #region PROPERTIES
-
-        [ObservableProperty]
-        protected string _title;
-
-        [ObservableProperty]
-        protected string _description;
-
-        [ObservableProperty]
-        protected string _author;
-
-        [ObservableProperty]
-        protected DateTime _publishDate;
-
-        [ObservableProperty]
-        protected TimeSpan _duration;
-
-        [ObservableProperty]
-        protected int _viewCount;
-
-        [ObservableProperty]
-        protected string? _thumbnailUrl;
-
-        [ObservableProperty]
-        protected ObservableCollection<VideoStream> _streams;
-
-        [ObservableProperty]
-        protected string _url;
-
-        [ObservableProperty]
-        protected Source _source;
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        protected Video()
-        {
-            _streams = new ObservableCollection<VideoStream>();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Common/VideoStream.cs b/VDownload.Common/VideoStream.cs
deleted file mode 100644
index 04a0b1c..0000000
--- a/VDownload.Common/VideoStream.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Common
-{
-    public abstract partial class VideoStream : ObservableObject
-    {
-        #region PROPERTIES
-
-        [ObservableProperty]
-        protected string _streamIdentifier;
-
-        [ObservableProperty]
-        private int _width;
-
-        #endregion
-    }
-}
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AuthenticationViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AuthenticationViewResources.resw
new file mode 100644
index 0000000..f1c32dd
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AuthenticationViewResources.resw
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AuthenticationButtonSignIn.Value" xml:space="preserve">
+    <value>Sign in</value>
+  </data>
+  <data name="AuthenticationButtonSignOut.Value" xml:space="preserve">
+    <value>Sign out</value>
+  </data>
+  <data name="AuthenticationDescriptionLoading.Value" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
+  <data name="Header.Text" xml:space="preserve">
+    <value>Authentication</value>
+  </data>
+  <data name="TwitchAuthenticationDescriptionAuthenticated" xml:space="preserve">
+    <value>Signed in as {0}.  Expiration date: {1}</value>
+  </data>
+  <data name="TwitchAuthenticationDescriptionAuthenticationInvalid" xml:space="preserve">
+    <value>Token expired or is invalid. Please log in again</value>
+  </data>
+  <data name="TwitchAuthenticationDescriptionNotAuthenticated" xml:space="preserve">
+    <value>You are not authenticated. Please sign in</value>
+  </data>
+  <data name="TwitchAuthenticationDialogTitle" xml:space="preserve">
+    <value>Twitch authentication error</value>
+  </data>
+  <data name="TwitchAuthenticationWindowTitle" xml:space="preserve">
+    <value>Sign in to Twitch</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload/Strings/en-US/Resources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
similarity index 96%
rename from VDownload/Strings/en-US/Resources.resw
rename to VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
index 0bc6244..df0e3fa 100644
--- a/VDownload/Strings/en-US/Resources.resw
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Main_OptionBar_PlaylistSearchTB.PlaceholderText" xml:space="preserve">
-    <value>Test</value>
+  <data name="AuthenticationNavigationViewItem" xml:space="preserve">
+    <value>Authentication</value>
+  </data>
+  <data name="HomeNavigationViewItem" xml:space="preserve">
+    <value>Home</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeDownloadsViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeDownloadsViewResources.resw
new file mode 100644
index 0000000..3867e3d
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeDownloadsViewResources.resw
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
+    <value>Only audio</value>
+  </data>
+  <data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
+    <value>Only video</value>
+  </data>
+  <data name="MediaTypeOriginal.Text" xml:space="preserve">
+    <value>Original</value>
+  </data>
+  <data name="StatusCancelled.Text" xml:space="preserve">
+    <value>Cancelled</value>
+  </data>
+  <data name="StatusDone.Text" xml:space="preserve">
+    <value>Done</value>
+  </data>
+  <data name="StatusDownloading.Text" xml:space="preserve">
+    <value>Downloading</value>
+  </data>
+  <data name="StatusError.Text" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="StatusFinalizing.Text" xml:space="preserve">
+    <value>Finalizing</value>
+  </data>
+  <data name="StatusIdle.Text" xml:space="preserve">
+    <value>Idle</value>
+  </data>
+  <data name="StatusInitializing.Text" xml:space="preserve">
+    <value>Initializing</value>
+  </data>
+  <data name="StatusProcessing.Text" xml:space="preserve">
+    <value>Processing</value>
+  </data>
+  <data name="StatusQueued.Text" xml:space="preserve">
+    <value>Queued</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoViewResources.resw
new file mode 100644
index 0000000..b8b8cf7
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoViewResources.resw
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CreateAndStartButton.Content" xml:space="preserve">
+    <value>Create download task and start</value>
+  </data>
+  <data name="CreateButton.Content" xml:space="preserve">
+    <value>Create download task</value>
+  </data>
+  <data name="DirectorySettingsCard.Header" xml:space="preserve">
+    <value>Directory</value>
+  </data>
+  <data name="DirectorySettingsCardButton.Content" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="FilenameSettingsCard.Header" xml:space="preserve">
+    <value>Filename</value>
+  </data>
+  <data name="FileOptionsHeader.Text" xml:space="preserve">
+    <value>File options</value>
+  </data>
+  <data name="FileTypeSettingsCard.Description" xml:space="preserve">
+    <value>If original video is not in selected type, it will be converted</value>
+  </data>
+  <data name="FileTypeSettingsCard.Header" xml:space="preserve">
+    <value>File type</value>
+  </data>
+  <data name="MediaOptionsHeader.Text" xml:space="preserve">
+    <value>Media options</value>
+  </data>
+  <data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
+    <value>Only audio</value>
+  </data>
+  <data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
+    <value>Only video</value>
+  </data>
+  <data name="MediaTypeOriginal.Text" xml:space="preserve">
+    <value>Original</value>
+  </data>
+  <data name="MediaTypeSettingsCard.Header" xml:space="preserve">
+    <value>Media type</value>
+  </data>
+  <data name="QualitySettingsCard.Header" xml:space="preserve">
+    <value>Quality</value>
+  </data>
+  <data name="TrimEndSettingsCard.Header" xml:space="preserve">
+    <value>End at</value>
+  </data>
+  <data name="TrimSettingsGroup.Header" xml:space="preserve">
+    <value>Trim</value>
+  </data>
+  <data name="TrimStartSettingsCard.Header" xml:space="preserve">
+    <value>Start at</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
new file mode 100644
index 0000000..907f620
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="OptionBarDownloadAll.Label" xml:space="preserve">
+    <value>Download all</value>
+  </data>
+  <data name="OptionBarDownloadAll.Width" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="OptionBarLoadSubscription.Label" xml:space="preserve">
+    <value>Load from subscriptions</value>
+  </data>
+  <data name="OptionBarLoadSubscription.Width" xml:space="preserve">
+    <value>150</value>
+  </data>
+  <data name="OptionBarMessageLoading" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
+  <data name="OptionBarPlaylistSearch.Label" xml:space="preserve">
+    <value>Playlist search</value>
+  </data>
+  <data name="OptionBarPlaylistSearch.Width" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="OptionBarPlaylistSearchContentNumberBox.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Number of videos to get from playlist
+0 = Get all</value>
+  </data>
+  <data name="OptionBarPlaylistSearchContentTextBox.PlaceholderText" xml:space="preserve">
+    <value>Playlist URL</value>
+  </data>
+  <data name="OptionBarSearchButton.Content" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="OptionBarVideoSearch.Label" xml:space="preserve">
+    <value>Video search</value>
+  </data>
+  <data name="OptionBarVideoSearch.Width" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="OptionBarVideoSearchContentTextBox.PlaceholderText" xml:space="preserve">
+    <value>Video URL</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/NotificationsResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/NotificationsResources.resw
new file mode 100644
index 0000000..2096eb0
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/NotificationsResources.resw
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Author" xml:space="preserve">
+    <value>Author</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="OnSuccessfulTitle" xml:space="preserve">
+    <value>Task ended successfully</value>
+  </data>
+  <data name="OnUnsuccessfulTitle" xml:space="preserve">
+    <value>Task ended unsuccessfully</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Title</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload.Tasks/VDownload.Tasks.csproj b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
similarity index 73%
rename from VDownload.Tasks/VDownload.Tasks.csproj
rename to VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
index 403e8e0..2a99cd6 100644
--- a/VDownload.Tasks/VDownload.Tasks.csproj
+++ b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
@@ -2,10 +2,10 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.Tasks</RootNamespace>
+    <RootNamespace>VDownload.Core.Strings</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
+	  <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\VDownload.Common\VDownload.Common.csproj" />
+    <PRIResource Update="Strings\en-US\BaseViewResources.resw">
+      <Generator></Generator>
+    </PRIResource>
   </ItemGroup>
 </Project>
diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs
new file mode 100644
index 0000000..4686cba
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs
@@ -0,0 +1,229 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using VDownload.Models;
+using VDownload.Services.Utility.FFmpeg;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using Windows.System;
+using System.Threading;
+using System.Threading.Tasks;
+using System;
+using System.Linq;
+using Windows.Storage;
+using System.IO;
+using VDownload.Services.UI.Notifications;
+using VDownload.Services.UI.StringResources;
+using System.Collections.Generic;
+
+namespace VDownload.Core.Tasks
+{
+    public partial class DownloadTask : ObservableObject
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+        protected readonly IFFmpegService _ffmpegService;
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly INotificationsService _notificationsService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
+        private CancellationTokenSource? _cancellationTokenSource;
+
+        private Task _downloadTask;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        [ObservableProperty]
+        protected Guid _id;
+
+        [ObservableProperty]
+        protected Video _video;
+
+        [ObservableProperty]
+        protected VideoDownloadOptions _downloadOptions;
+
+        [ObservableProperty]
+        protected DownloadTaskStatus _status;
+
+        [ObservableProperty]
+        protected DateTime _createDate;
+
+        [ObservableProperty]
+        protected double _progress;
+
+        [ObservableProperty]
+        protected string? _error;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        internal DownloadTask(Video video, VideoDownloadOptions downloadOptions, IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, IStringResourcesService stringResourcesService, INotificationsService notificationsService)
+        {
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+            _ffmpegService = ffmpegService;
+            _stringResourcesService = stringResourcesService;
+            _notificationsService = notificationsService;
+
+            _video = video;
+            _downloadOptions = downloadOptions;
+            _id = Guid.NewGuid();
+            _status = DownloadTaskStatus.Idle;
+            _createDate = DateTime.Now;
+            _progress = 0;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public void Enqueue()
+        {
+            DownloadTaskStatus[] statuses =
+            [
+                DownloadTaskStatus.Idle,
+                DownloadTaskStatus.EndedUnsuccessfully,
+                DownloadTaskStatus.EndedSuccessfully,
+                DownloadTaskStatus.EndedCancelled,
+            ];
+            if (statuses.Contains(Status))
+            {
+                Status = DownloadTaskStatus.Queued;
+            }
+        }
+
+        internal void Start()
+        {
+            _cancellationTokenSource = new CancellationTokenSource();
+
+            UpdateStatusWithDispatcher(DownloadTaskStatus.Initializing);
+
+            _downloadTask = Download();
+        }
+
+        public async Task Cancel()
+        {
+            if (_cancellationTokenSource is not null)
+            {
+                _cancellationTokenSource.Cancel();
+                await _downloadTask;
+                _cancellationTokenSource.Dispose();
+                _cancellationTokenSource = null;
+            }
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private async Task Download()
+        {
+            CancellationToken token = _cancellationTokenSource.Token;
+
+            await _settingsService.Load();
+
+            string tempDirectory = $"{_settingsService.Data.Common.TempDirectory}\\{_configurationService.Common.Path.Temp.TasksDirectory}\\{_id}";
+            Directory.CreateDirectory(tempDirectory);
+
+            List<string> content = new List<string>()
+            {
+                $"{_stringResourcesService.NotificationsResources.Get("Title")}: {Video.Title}",
+                $"{_stringResourcesService.NotificationsResources.Get("Author")}: {Video.Author}"
+            };
+
+            try
+            {
+                IProgress<double> onProgressDownloading = new Progress<double>((value) =>
+                {
+                    UpdateStatusWithDispatcher(DownloadTaskStatus.Downloading);
+                    UpdateProgressWithDispatcher(value);
+                });
+
+                VideoStreamDownloadResult downloadResult = await DownloadOptions.SelectedStream.Download(tempDirectory, onProgressDownloading, token, DownloadOptions.TrimStart, DownloadOptions.TrimEnd);
+
+                Action<double> onProgressProcessing = (value) =>
+                {
+                    UpdateStatusWithDispatcher(DownloadTaskStatus.Processing);
+                    UpdateProgressWithDispatcher(value);
+                };
+                string outputPath = $"{tempDirectory}\\processed.{DownloadOptions.Extension}";
+
+                FFmpegBuilder ffmpegBuilder = _ffmpegService.CreateBuilder();
+                if (downloadResult.NewTrimStart != TimeSpan.Zero)
+                {
+                    ffmpegBuilder.TrimStart(downloadResult.NewTrimStart);
+                }
+                if (downloadResult.NewTrimEnd != downloadResult.NewDuration)
+                {
+                    ffmpegBuilder.TrimEnd(downloadResult.NewTrimEnd);
+                }
+                ffmpegBuilder.SetMediaType(DownloadOptions.MediaType)
+                             .JoinCancellationToken(token)
+                             .JoinProgressReporter(onProgressProcessing, downloadResult.NewDuration);
+                await ffmpegBuilder.RunAsync(downloadResult.File, outputPath);
+
+                UpdateStatusWithDispatcher(DownloadTaskStatus.Finalizing);
+
+                string destination = $"{DownloadOptions.Directory}\\{DownloadOptions.Filename}.{DownloadOptions.Extension}";
+                File.Copy(outputPath, destination, true);
+
+                UpdateStatusWithDispatcher(DownloadTaskStatus.EndedSuccessfully);
+
+                if (_settingsService.Data.Common.Notifications.OnSuccessful)
+                {
+                    string title = _stringResourcesService.NotificationsResources.Get("OnSuccessfulTitle");
+                    _notificationsService.SendNotification(title, content);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                UpdateStatusWithDispatcher(DownloadTaskStatus.EndedCancelled);
+            }
+            catch (Exception ex)
+            {
+                UpdateErrorWithDispatcher(ex.Message);
+                UpdateStatusWithDispatcher(DownloadTaskStatus.EndedUnsuccessfully);
+
+                if (_settingsService.Data.Common.Notifications.OnUnsuccessful)
+                {
+                    string title = _stringResourcesService.NotificationsResources.Get("OnSuccessfulTitle");
+                    content.Add($"{_stringResourcesService.NotificationsResources.Get("Message")}: {ex.Message}");
+                    _notificationsService.SendNotification(title, content);
+                }
+            }
+            finally
+            {
+                if (Status != DownloadTaskStatus.EndedUnsuccessfully || _settingsService.Data.Common.DeleteTempOnError)
+                {
+                    Directory.Delete(tempDirectory, true);
+                }
+            }
+        }
+
+        private void UpdateStatusWithDispatcher(DownloadTaskStatus status) => _dispatcherQueue.TryEnqueue(() => Status = status);
+
+        private void UpdateProgressWithDispatcher(double progress) => _dispatcherQueue.TryEnqueue(() => Progress = progress);
+
+        private void UpdateErrorWithDispatcher(string message) => _dispatcherQueue.TryEnqueue(() => Error = message);
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs
new file mode 100644
index 0000000..ff2b3f2
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using VDownload.Services.UI.Notifications;
+using VDownload.Services.UI.StringResources;
+using VDownload.Services.Utility.FFmpeg;
+
+namespace VDownload.Core.Tasks
+{
+    public interface IDownloadTaskFactoryService
+    {
+        DownloadTask Create(Video video, VideoDownloadOptions downloadOptions);
+    }
+
+
+
+    public class DownloadTaskFactoryService : IDownloadTaskFactoryService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+        protected readonly IFFmpegService _ffmpegService;
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly INotificationsService _notificationsService;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public DownloadTaskFactoryService(IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, IStringResourcesService stringResourcesService, INotificationsService notificationsService)
+        {
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+            _ffmpegService = ffmpegService;
+            _stringResourcesService = stringResourcesService;
+            _notificationsService = notificationsService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public DownloadTask Create(Video video, VideoDownloadOptions downloadOptions)
+        {
+            return new DownloadTask(video, downloadOptions, _configurationService, _settingsService, _ffmpegService, _stringResourcesService, _notificationsService);
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTaskManager.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskManager.cs
new file mode 100644
index 0000000..3d1773a
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskManager.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Settings;
+
+namespace VDownload.Core.Tasks
+{
+    public interface IDownloadTaskManager
+    {
+        #region PROPERTIES
+
+        ReadOnlyObservableCollection<DownloadTask> Tasks { get; }
+
+        #endregion
+
+
+
+        #region EVENTS
+
+        event NotifyCollectionChangedEventHandler TaskCollectionChanged;
+
+        #endregion
+
+
+
+        #region METHODS
+
+        DownloadTask AddTask(Video video, VideoDownloadOptions downloadOptions);
+        void RemoveTask(DownloadTask task);
+
+        #endregion
+    }
+
+
+
+    public class DownloadTaskManager : IDownloadTaskManager
+    {
+        #region SERVICES
+
+        protected readonly IDownloadTaskFactoryService _downloadTaskFactoryService;
+        protected readonly ISettingsService _settingsService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        private readonly Thread _taskMonitorThread;
+
+        private readonly ObservableCollection<DownloadTask> _tasksMain;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public ReadOnlyObservableCollection<DownloadTask> Tasks { get; protected set; }
+
+        #endregion
+
+
+
+        #region EVENTS
+
+        public event NotifyCollectionChangedEventHandler TaskCollectionChanged;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public DownloadTaskManager(IDownloadTaskFactoryService downloadTaskFactoryService, ISettingsService settingsService)
+        {
+            _downloadTaskFactoryService = downloadTaskFactoryService;
+            _settingsService = settingsService;
+
+            _tasksMain = new ObservableCollection<DownloadTask>();
+            _tasksMain.CollectionChanged += Tasks_CollectionChanged;
+            Tasks = new ReadOnlyObservableCollection<DownloadTask>(_tasksMain);
+
+            _taskMonitorThread = new Thread(TaskMonitor)
+            {
+                IsBackground = true
+            };
+            _taskMonitorThread.Start();
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public DownloadTask AddTask(Video video, VideoDownloadOptions downloadOptions)
+        {
+            DownloadTask task = _downloadTaskFactoryService.Create(video, downloadOptions);
+            _tasksMain.Add(task);
+            return task;
+        }
+
+        public void RemoveTask(DownloadTask task)
+        {
+            _tasksMain.Remove(task);
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private async void TaskMonitor()
+        {
+            await _settingsService.Load();
+
+            DownloadTaskStatus[] pendingStatuses =
+            [
+                DownloadTaskStatus.Initializing,
+                DownloadTaskStatus.Downloading,
+                DownloadTaskStatus.Processing,
+                DownloadTaskStatus.Finalizing
+            ];
+
+            while (true)
+            {
+                try
+                {
+                    IEnumerable<DownloadTask> pendingTasks = Tasks.Where(x => pendingStatuses.Contains(x.Status));
+                    int freeSlots = _settingsService.Data.Common.MaxNumberOfRunningTasks - pendingTasks.Count();
+                    if (freeSlots > 0)
+                    {
+                        IEnumerable<DownloadTask> queuedTasks = Tasks.Where(x => x.Status == DownloadTaskStatus.Queued).OrderBy(x => x.CreateDate).Take(freeSlots);
+                        foreach (DownloadTask queuedTask in queuedTasks)
+                        {
+                            queuedTask.Start();
+                        }
+                    }
+                }
+                catch (InvalidOperationException)
+                {
+                    Console.WriteLine("TaskMonitor: Collection locked - skipping");
+                }
+            }
+        }
+
+        #endregion
+
+
+
+        #region EVENT HANDLERS
+
+        private void Tasks_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            TaskCollectionChanged?.Invoke(this, e);
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTaskNotInitializedException.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskNotInitializedException.cs
new file mode 100644
index 0000000..4b47b20
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskNotInitializedException.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Core.Tasks
+{
+    public class DownloadTaskNotInitializedException : Exception
+    {
+        #region CONSTRUCTORS
+
+        public DownloadTaskNotInitializedException() : base() { }
+
+        public DownloadTaskNotInitializedException(string message) : base(message) { }
+
+        public DownloadTaskNotInitializedException(string message, Exception inner) : base(message, inner) { }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Tasks/DownloadTaskStatus.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskStatus.cs
similarity index 92%
rename from VDownload.Tasks/DownloadTaskStatus.cs
rename to VDownload.Core/VDownload.Core.Tasks/DownloadTaskStatus.cs
index 0ecc84c..b6fa6d1 100644
--- a/VDownload.Tasks/DownloadTaskStatus.cs
+++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskStatus.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common
+namespace VDownload.Core.Tasks
 {
     public enum DownloadTaskStatus
     {
@@ -14,8 +14,8 @@ namespace VDownload.Common
         EndedCancelled,
         Queued,
         Initializing,
+        Finalizing,
         Processing,
         Downloading,
-        Finalizing,
     }
 }
diff --git a/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj
new file mode 100644
index 0000000..7d67dc3
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	  <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+	  <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+	  <RootNamespace>VDownload.Core.Tasks</RootNamespace>
+	  <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+	  <UseWinUI>true</UseWinUI>
+	  <UseRidGraph>true</UseRidGraph>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\VDownload.Models\VDownload.Models.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Notifications\VDownload.Services.UI.Notifications.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.FFmpeg\VDownload.Services.Utility.FFmpeg.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.GUI/VDownload.GUI.ViewModels/AuthenticationViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs
similarity index 54%
rename from VDownload.GUI/VDownload.GUI.ViewModels/AuthenticationViewModel.cs
rename to VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs
index 6b148da..623cf20 100644
--- a/VDownload.GUI/VDownload.GUI.ViewModels/AuthenticationViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs
@@ -1,19 +1,18 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using VDownload.GUI.Services.Dialog;
-using VDownload.GUI.Services.WebView;
-using VDownload.Sources.Twitch;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.UI.Dialogs;
+using VDownload.Services.UI.StringResources;
+using VDownload.Services.UI.WebView;
 using VDownload.Sources.Twitch.Authentication;
 
-namespace VDownload.GUI.ViewModels
+namespace VDownload.Core.ViewModels.Authentication
 {
     public partial class AuthenticationViewModel : ObservableObject
     {
@@ -32,9 +31,11 @@ namespace VDownload.GUI.ViewModels
 
         #region SERVICES
 
-        private IDialogService _dialogService;
-        private IWebViewService _webViewService;
-        private ITwitchAuthenticationService _twitchAuthenticationService;
+        protected readonly IDialogsService _dialogsService;
+        protected readonly IWebViewService _webViewService;
+        protected readonly IConfigurationService _configurationService;
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly ITwitchAuthenticationService _twitchAuthenticationService;
 
         #endregion
 
@@ -43,10 +44,10 @@ namespace VDownload.GUI.ViewModels
         #region PROPERTIES
 
         [ObservableProperty]
-        private string _twitchDescription;
+        private AuthenticationButton _twitchButtonState = AuthenticationButton.Loading;
 
         [ObservableProperty]
-        private AuthenticationButton _twitchButtonState;
+        private string _twitchDescription;
 
         #endregion
 
@@ -54,13 +55,13 @@ namespace VDownload.GUI.ViewModels
 
         #region CONSTRUCTORS
 
-        public AuthenticationViewModel(IDialogService dialogService, IWebViewService webViewService, ITwitchAuthenticationService twitchAuthenticationService)
+        public AuthenticationViewModel(IDialogsService dialogsService, IWebViewService webViewService, IConfigurationService configurationService, IStringResourcesService stringResourcesService, ITwitchAuthenticationService twitchAuthenticationService)
         {
-            _dialogService = dialogService;
+            _dialogsService = dialogsService;
             _webViewService = webViewService;
+            _configurationService = configurationService;
+            _stringResourcesService = stringResourcesService;
             _twitchAuthenticationService = twitchAuthenticationService;
-
-            TwitchButtonState = AuthenticationButton.Loading;
         }
 
         #endregion
@@ -69,6 +70,16 @@ namespace VDownload.GUI.ViewModels
 
         #region PUBLIC METHODS
 
+        [RelayCommand]
+        public async Task Navigation()
+        {
+            List<Task> refreshTasks = new List<Task>
+            {
+                TwitchAuthenticationRefresh()
+            };
+            await Task.WhenAll(refreshTasks);
+        }
+
         [RelayCommand]
         public async Task TwitchAuthentication()
         {
@@ -81,9 +92,13 @@ namespace VDownload.GUI.ViewModels
             }
             else
             {
-                string url = await _webViewService.Show(new Uri(_twitchAuthenticationService.AuthenticationPageUrl), _twitchAuthenticationService.AuthenticationPageClosePredicate, "Twitch authentication");
+                Sources.Twitch.Configuration.Models.Authentication auth = _configurationService.Twitch.Authentication;
+                string authUrl = string.Format(auth.Url, auth.ClientId, auth.RedirectUrl, auth.ResponseType, string.Join(' ', auth.Scopes));
 
-                Match match = _twitchAuthenticationService.AuthenticationPageRedirectUrlRegex.Match(url);
+                string url = await _webViewService.Show(new Uri(authUrl), (url) => url.StartsWith(auth.RedirectUrl), _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationWindowTitle"));
+
+                Regex regex = new Regex(auth.RedirectUrlRegex);
+                Match match = regex.Match(url);
 
                 if (match.Success)
                 {
@@ -92,22 +107,12 @@ namespace VDownload.GUI.ViewModels
                 }
                 else
                 {
-                    await _dialogService.ShowOk("Twitch authentication error", "An error occured");
+                    await _dialogsService.ShowOk(_stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDialogTitle"), "An unknown error occured"); // TODO : Change to string resource
                 }
             }
             await TwitchAuthenticationRefresh();
         }
 
-        [RelayCommand]
-        public async Task Navigation()
-        {
-            List<Task> refreshTasks = new List<Task>
-            {
-                TwitchAuthenticationRefresh() 
-            };
-            await Task.WhenAll(refreshTasks);
-        }
-
         #endregion
 
 
@@ -122,7 +127,7 @@ namespace VDownload.GUI.ViewModels
 
             if (token is null)
             {
-                TwitchDescription = "You are not authenticated. Please sign in";
+                TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionNotAuthenticated");
                 TwitchButtonState = AuthenticationButton.SignIn;
             }
             else
@@ -130,13 +135,13 @@ namespace VDownload.GUI.ViewModels
                 TwitchValidationResult validationResult = await _twitchAuthenticationService.ValidateToken(token);
                 if (validationResult.Success)
                 {
-                    TwitchDescription = $"Signed in as {validationResult.TokenData.Login}. Expiration date: {validationResult.TokenData.ExpirationDate:dd.MM.yyyy HH:mm}";
+                    TwitchDescription = string.Format(_stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionAuthenticated"), validationResult.TokenData.Login, validationResult.TokenData.ExpirationDate);
                     TwitchButtonState = AuthenticationButton.SignOut;
                 }
                 else
                 {
                     await _twitchAuthenticationService.DeleteToken();
-                    TwitchDescription = "Token expired or is invalid. Please log in again";
+                    TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionAuthenticationInvalid");
                     TwitchButtonState = AuthenticationButton.SignIn;
                 }
             }
diff --git a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs
new file mode 100644
index 0000000..9b5adfc
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs
@@ -0,0 +1,110 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Core.ViewModels.Authentication;
+using VDownload.Core.ViewModels.Home;
+using VDownload.Core.ViewModels.Settings;
+using VDownload.Services.UI.DictionaryResources;
+using VDownload.Services.UI.StringResources;
+using VDownload.Toolkit.UI.Models;
+
+namespace VDownload.Core.ViewModels
+{
+    public partial class BaseViewModel : ObservableObject
+    {
+        #region SERVICES
+
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly IDictionaryResourcesService _dictionaryResourcesService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected readonly Type _settingsViewModel = typeof(SettingsViewModel);
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        [ObservableProperty]
+        private Type _currentViewModel;
+
+        [ObservableProperty]
+        private NavigationViewItem _selectedItem;
+
+        public ReadOnlyObservableCollection<NavigationViewItem> Items { get; protected set; }
+        public ReadOnlyObservableCollection<NavigationViewItem> FooterItems { get; protected set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public BaseViewModel(IStringResourcesService stringResourcesService, IDictionaryResourcesService dictionaryResourcesService)
+        {
+            _stringResourcesService = stringResourcesService;
+            _dictionaryResourcesService = dictionaryResourcesService;
+
+            Items = new ReadOnlyObservableCollection<NavigationViewItem>
+            (
+                new ObservableCollection<NavigationViewItem>
+                {
+                    new NavigationViewItem()
+                    {
+                        Name = _stringResourcesService.BaseViewResources.Get("HomeNavigationViewItem"),
+                        IconSource = _dictionaryResourcesService.Get<string>("ImageBaseViewHome"),
+                        ViewModel = typeof(HomeViewModel),
+                    }
+                }
+            );
+            FooterItems = new ReadOnlyObservableCollection<NavigationViewItem>
+            (
+                new ObservableCollection<NavigationViewItem>
+                {
+                    new NavigationViewItem()
+                    {
+                        Name = _stringResourcesService.BaseViewResources.Get("AuthenticationNavigationViewItem"),
+                        IconSource = _dictionaryResourcesService.Get<string>("ImageBaseViewAuthentication"),
+                        ViewModel = typeof(AuthenticationViewModel),
+                    }
+                }
+            );
+
+            SelectedItem = Items.First();
+            CurrentViewModel = SelectedItem.ViewModel;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        [RelayCommand]
+        public void Navigate(Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs e)
+        {
+            if (e.IsSettingsInvoked)
+            {
+                CurrentViewModel = _settingsViewModel;
+            }
+            else
+            {
+                NavigationViewItem item = e.InvokedItemContainer.DataContext as NavigationViewItem;
+                CurrentViewModel = item.ViewModel;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs
new file mode 100644
index 0000000..1af5186
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs
@@ -0,0 +1,90 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Core.Tasks;
+
+namespace VDownload.Core.ViewModels.Home
+{
+    public partial class HomeDownloadsViewModel : ObservableObject
+    {
+        #region SERVICES
+
+        protected readonly IDownloadTaskManager _tasksManager;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public ReadOnlyObservableCollection<DownloadTask> Tasks => _tasksManager.Tasks;
+
+        [ObservableProperty]
+        private bool _taskListIsEmpty;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public HomeDownloadsViewModel(IDownloadTaskManager tasksManager)
+        {
+            _tasksManager = tasksManager;
+            _tasksManager.TaskCollectionChanged += Tasks_CollectionChanged;
+
+            _taskListIsEmpty = _tasksManager.Tasks.Count == 0;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        [RelayCommand]
+        public async Task StartCancelTask(DownloadTask task)
+        {
+            DownloadTaskStatus[] idleStatuses =
+            [
+                DownloadTaskStatus.Idle,
+                DownloadTaskStatus.EndedUnsuccessfully,
+                DownloadTaskStatus.EndedSuccessfully,
+                DownloadTaskStatus.EndedCancelled
+            ];
+            if (idleStatuses.Contains(task.Status))
+            {
+                task.Enqueue();
+            }
+            else
+            {
+                await task.Cancel();
+            }
+        }
+
+        [RelayCommand]
+        public async Task RemoveTask(DownloadTask task)
+        {
+            await task.Cancel();
+            _tasksManager.RemoveTask(task);
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private void Tasks_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            TaskListIsEmpty = Tasks.Count == 0;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs
new file mode 100644
index 0000000..9de4c76
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs
@@ -0,0 +1,185 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Core.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Settings;
+using VDownload.Services.UI.StoragePicker;
+
+namespace VDownload.Core.ViewModels.Home
+{
+    public partial class HomeVideoViewModel : ObservableObject
+    {
+        #region SERVICES
+
+        protected readonly IDownloadTaskManager _tasksManager;
+
+        protected readonly ISettingsService _settingsService;
+        protected readonly IStoragePickerService _storagePickerService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected Video _video;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        [ObservableProperty]
+        protected Uri _thumbnailUrl;
+
+        [ObservableProperty]
+        protected string _title;
+
+        [ObservableProperty]
+        protected string _author;
+
+        [ObservableProperty]
+        protected DateTime _publishDate;
+
+        [ObservableProperty]
+        protected TimeSpan _duration;
+
+        [ObservableProperty]
+        protected long _views;
+
+
+        [ObservableProperty]
+        protected ObservableCollection<VideoStream> _streams;
+
+        [ObservableProperty]
+        protected VideoStream _selectedStream;
+
+        [ObservableProperty]
+        protected MediaType _mediaType;
+
+        [ObservableProperty]
+        protected TimeSpan _trimStart;
+
+        [ObservableProperty]
+        protected TimeSpan _trimEnd;
+
+        [ObservableProperty]
+        protected string _directoryPath;
+
+        [ObservableProperty]
+        protected string _filename;
+
+        [ObservableProperty]
+        protected VideoExtension _videoExtension;
+
+        [ObservableProperty]
+        protected AudioExtension _audioExtension;
+
+        #endregion
+
+
+
+        #region EVENTS
+
+        public event EventHandler TaskAdded;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public HomeVideoViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService) 
+        {
+            _tasksManager = tasksManager;
+            _settingsService = settingsService;
+            _storagePickerService = storagePickerService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public async void LoadVideo(Video video)
+        {
+            await _settingsService.Load();
+
+            _video = video;
+
+            ThumbnailUrl = video.ThumbnailUrl;
+            Title = video.Title;
+            Author = video.Author;
+            PublishDate = video.PublishDate;
+            Duration = video.Duration;
+            Views = video.Views;
+
+            Streams = [.. video.Streams];
+            SelectedStream = Streams[0];
+            MediaType = _settingsService.Data.Common.DefaultTaskSettings.MediaType;
+            TrimStart = TimeSpan.Zero;
+            TrimEnd = Duration;
+            DirectoryPath = _settingsService.Data.Common.DefaultTaskSettings.OutputDirectory;
+            Filename = Title.Length > 50 ? Title.Substring(0, 50) : Title;
+            VideoExtension = _settingsService.Data.Common.DefaultTaskSettings.VideoExtension;
+            AudioExtension = _settingsService.Data.Common.DefaultTaskSettings.AudioExtension;
+        }
+
+
+        [RelayCommand]
+        public async Task Browse()
+        {
+            string? newDirectory = await _storagePickerService.OpenDirectory();
+            if (newDirectory is not null)
+            {
+                this.DirectoryPath = newDirectory;
+            }
+        }
+
+        [RelayCommand]
+        public void CreateTask()
+        {
+            _tasksManager.AddTask(_video, BuildDownloadOptions());
+            TaskAdded?.Invoke(this, EventArgs.Empty);
+        }
+
+        [RelayCommand]
+        public void CreateTaskAndDownload()
+        {
+            DownloadTask task = _tasksManager.AddTask(_video, BuildDownloadOptions());
+            TaskAdded?.Invoke(this, EventArgs.Empty);
+            task.Enqueue();
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        protected VideoDownloadOptions BuildDownloadOptions()
+        {
+            return new VideoDownloadOptions(Duration)
+            {
+                MediaType = this.MediaType,
+                SelectedStream = this.SelectedStream,
+                TrimStart = this.TrimStart,
+                TrimEnd = this.TrimEnd,
+                Directory = this.DirectoryPath,
+                Filename = string.Join("_", this.Filename.Split(Path.GetInvalidFileNameChars())),
+                Extension = (this.MediaType == MediaType.OnlyAudio ? this.AudioExtension.ToString() : this.VideoExtension.ToString()).ToLower(),
+            };
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.GUI/VDownload.GUI.ViewModels/HomeViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
similarity index 57%
rename from VDownload.GUI/VDownload.GUI.ViewModels/HomeViewModel.cs
rename to VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
index 36ef96e..474b89e 100644
--- a/VDownload.GUI/VDownload.GUI.ViewModels/HomeViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
@@ -2,19 +2,17 @@
 using CommunityToolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using VDownload.Common;
-using VDownload.Common.Exceptions;
-using VDownload.Common.Models;
-using VDownload.GUI.Services.StoragePicker;
-using VDownload.Services.Search;
-using VDownload.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using VDownload.Services.UI.StringResources;
+using VDownload.Sources;
+using VDownload.Sources.Common;
 
-namespace VDownload.GUI.ViewModels
+namespace VDownload.Core.ViewModels.Home
 {
     public partial class HomeViewModel : ObservableObject
     {
@@ -39,9 +37,21 @@ namespace VDownload.GUI.ViewModels
 
         #region SERVICES
 
-        private IStoragePickerService _storagePickerService;
-        private ISearchService _searchService;
-        private IDownloadTasksManager _tasksService;
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly ISearchService _searchService;
+
+        protected readonly HomeVideoViewModel _videoViewModel;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected readonly Type _downloadsView = typeof(HomeDownloadsViewModel);
+        protected readonly Type _videoView = typeof(HomeVideoViewModel);
 
         #endregion
 
@@ -49,27 +59,10 @@ namespace VDownload.GUI.ViewModels
 
         #region PROPERTIES
 
-        // MAIN
-
         [ObservableProperty]
-        private MainContentType _mainContent;
+        private Type _mainContent;
 
 
-        // DOWNLOADS
-        public ObservableCollection<DownloadTask> Tasks => _tasksService.Tasks;
-
-        [ObservableProperty]
-        private bool _taskListIsEmpty;
-
-
-        // VIDEO
-
-        [ObservableProperty]
-        private DownloadTask _task;
-
-
-        // OPTION BAR
-
         [ObservableProperty]
         private OptionBarContentType _optionBarContent;
 
@@ -103,14 +96,15 @@ namespace VDownload.GUI.ViewModels
 
         #region CONSTRUCTORS
 
-        public HomeViewModel(IStoragePickerService storagePickerService, ISearchService searchService, IDownloadTasksManager tasksService) 
+        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, HomeVideoViewModel videoViewModel)
         {
-            _storagePickerService = storagePickerService;
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+            _stringResourcesService = stringResourcesService;
             _searchService = searchService;
-            _tasksService = tasksService;
-            _tasksService.Tasks.CollectionChanged += Tasks_CollectionChanged;
 
-            _taskListIsEmpty = _tasksService.Tasks.Count == 0;
+            _videoViewModel = videoViewModel;
+            _videoViewModel.TaskAdded += VideoViewModel_TaskAdded;
         }
 
         #endregion
@@ -120,9 +114,11 @@ namespace VDownload.GUI.ViewModels
         #region COMMANDS
 
         [RelayCommand]
-        public void Navigation()
+        public async Task Navigation()
         {
-            MainContent = MainContentType.Downloads;
+            await _settingsService.Load();
+
+            MainContent = _downloadsView;
 
             OptionBarContent = OptionBarContentType.None;
             OptionBarMessage = null;
@@ -130,74 +126,14 @@ namespace VDownload.GUI.ViewModels
             OptionBarPlaylistSearchButtonChecked = false;
             OptionBarSearchNotPending = true;
             OptionBarVideoSearchTBValue = string.Empty;
-            OptionBarPlaylistSearchNBValue = 1; // TODO: load from settings
+            OptionBarPlaylistSearchNBValue = _settingsService.Data.Common.MaxNumberOfVideosToGetFromPlaylist;
             OptionBarPlaylistSearchTBValue = string.Empty;
         }
 
-
-        // DOWNLOADS
-
-        [RelayCommand]
-        public void StartCancelTask(DownloadTask task)
-        {
-            DownloadTaskStatus[] idleStatuses =
-            [
-                DownloadTaskStatus.Idle,
-                DownloadTaskStatus.EndedUnsuccessfully,
-                DownloadTaskStatus.EndedSuccessfully,
-                DownloadTaskStatus.EndedCancelled
-            ];
-            if (idleStatuses.Contains(task.Status))
-            {
-                task.Enqueue();
-            }
-            else
-            {
-                task.Cancel();
-            }
-        }
-
-
-        // VIDEO
-
-        [RelayCommand]
-        public async Task Browse()
-        {
-            string? newDirectory = await _storagePickerService.OpenDirectory();
-            if (newDirectory is not null)
-            {
-                Task.DirectoryPath = newDirectory;
-            }
-        }
-
-        [RelayCommand]
-        public async Task CreateTask()
-        {
-            string extension = Task.MediaType switch
-            {
-                MediaType.OnlyAudio => Task.AudioExtension.ToString(),
-                _ => Task.VideoExtension.ToString()
-            };
-
-            Task.Filename = string.Join("_", Task.Filename.Split(Path.GetInvalidFileNameChars()));
-            string file = $"{Task.Filename}.{extension}";
-            string path = Path.Combine(Task.DirectoryPath, file);
-
-            await File.WriteAllBytesAsync(path, [0x00]);
-            File.Delete(path);
-
-            _tasksService.AddTask(Task);
-
-            Navigation();
-        }
-
-
-        // OPTION BAR
-
         [RelayCommand]
         public void LoadFromSubscription()
         {
-            MainContent = MainContentType.Downloads;
+            MainContent = _downloadsView;
 
             OptionBarContent = OptionBarContentType.None;
             OptionBarVideoSearchButtonChecked = false;
@@ -210,7 +146,7 @@ namespace VDownload.GUI.ViewModels
         [RelayCommand]
         public void VideoSearchShow()
         {
-            MainContent = MainContentType.Downloads;
+            MainContent = _downloadsView;
 
             if (OptionBarContent != OptionBarContentType.VideoSearch)
             {
@@ -226,7 +162,7 @@ namespace VDownload.GUI.ViewModels
         [RelayCommand]
         public void PlaylistSearchShow()
         {
-            MainContent = MainContentType.Downloads;
+            MainContent = _downloadsView;
 
             if (OptionBarContent != OptionBarContentType.PlaylistSearch)
             {
@@ -244,7 +180,7 @@ namespace VDownload.GUI.ViewModels
         {
             OptionBarSearchNotPending = false;
             OptionBarLoading = true;
-            OptionBarMessage = "Loading...";
+            OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageLoading");
 
             Video video;
             try
@@ -259,9 +195,9 @@ namespace VDownload.GUI.ViewModels
                 return;
             }
 
-            Task = new DownloadTask(video);
+            _videoViewModel.LoadVideo(video);
 
-            MainContent = MainContentType.Video;
+            MainContent = _videoView;
 
             OptionBarSearchNotPending = true;
             OptionBarLoading = false;
@@ -273,7 +209,7 @@ namespace VDownload.GUI.ViewModels
         {
             OptionBarSearchNotPending = false;
             OptionBarLoading = true;
-            OptionBarMessage = "Loading...";
+            OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageLoading");
 
             Playlist playlist;
             try
@@ -303,12 +239,9 @@ namespace VDownload.GUI.ViewModels
 
 
 
-        #region EVENT HANDLERS
+        #region PRIVATE METHODS
 
-        private void Tasks_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            TaskListIsEmpty = Tasks.Count == 0;
-        }
+        private async void VideoViewModel_TaskAdded(object sender, EventArgs e) => await Navigation();
 
         #endregion
     }
diff --git a/VDownload.GUI/VDownload.GUI.ViewModels/SettingsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs
similarity index 54%
rename from VDownload.GUI/VDownload.GUI.ViewModels/SettingsViewModel.cs
rename to VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs
index 372d06c..3d57811 100644
--- a/VDownload.GUI/VDownload.GUI.ViewModels/SettingsViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs
@@ -4,16 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.ViewModels
+namespace VDownload.Core.ViewModels.Settings
 {
     public class SettingsViewModel
     {
-        #region CONSTRUCTORS
-
-        public SettingsViewModel() 
-        { 
-        }
-
-        #endregion
     }
 }
diff --git a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
new file mode 100644
index 0000000..9f8b80b
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>VDownload.Core.ViewModels</RootNamespace>
+		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<UseRidGraph>true</UseRidGraph>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+	</ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Dialogs\VDownload.Services.UI.Dialogs.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.DictionaryResources\VDownload.Services.UI.DictionaryResources.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StoragePicker\VDownload.Services.UI.StoragePicker.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.WebView\VDownload.Services.UI.WebView.csproj" />
+    <ProjectReference Include="..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj" />
+    <ProjectReference Include="..\..\VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj" />
+    <ProjectReference Include="..\..\VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Models\VDownload.Toolkit.UI.Models.csproj" />
+    <ProjectReference Include="..\VDownload.Core.Tasks\VDownload.Core.Tasks.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
similarity index 67%
rename from VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml
rename to VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
index 40164b8..4b70241 100644
--- a/VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="VDownload.GUI.Views.AuthenticationView"
+    x:Class="VDownload.Core.Views.Authentication.AuthenticationView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.GUI.Views"
+    xmlns:local="using:VDownload.Core.Views.Authentication"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
@@ -18,50 +18,51 @@
             <ic:InvokeCommandAction Command="{Binding NavigationCommand}"/>
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
-    <Grid Padding="20" RowSpacing="20">
+    <Grid Padding="20"
+          RowSpacing="20">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0"
+        <TextBlock x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/Header"
+                   Grid.Row="0"
                    FontSize="28"
-                   FontWeight="SemiBold"
-                   Text="Authentication"/>
+                   FontWeight="SemiBold"/>
         <StackPanel Grid.Row="1"
                     Spacing="10">
             <ctc:SettingsCard Header="Twitch">
                 <i:Interaction.Behaviors>
-                    <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource EnumToStringConverter}}"
-                                            ComparisonCondition="NotEqual"
-                                            Value="Loading">
+                    <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}"
+                                    ComparisonCondition="NotEqual"
+                                    Value="Loading">
                         <ic:ChangePropertyAction PropertyName="Description"
-                                                 Value="{Binding TwitchDescription}"/>
+                                         Value="{Binding TwitchDescription}"/>
                         <ic:ChangePropertyAction PropertyName="Content">
                             <ic:ChangePropertyAction.Value>
                                 <Button Command="{Binding TwitchAuthenticationCommand}">
                                     <i:Interaction.Behaviors>
-                                        <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource EnumToStringConverter}}"
-                                                                ComparisonCondition="Equal"
-                                                                Value="SignIn">
-                                            <ic:ChangePropertyAction PropertyName="Content"
-                                                                     Value="Sign in"/>
+                                        <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}"
+                                                        ComparisonCondition="Equal"
+                                                        Value="SignIn">
+                                            <ic:ChangePropertyAction x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationButtonSignIn"
+                                                                     PropertyName="Content"/>
                                         </ic:DataTriggerBehavior>
-                                        <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource EnumToStringConverter}}"
-                                                                ComparisonCondition="Equal"
-                                                                Value="SignOut">
-                                            <ic:ChangePropertyAction PropertyName="Content"
-                                                                     Value="Sign out"/>
+                                        <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}"
+                                                        ComparisonCondition="Equal"
+                                                        Value="SignOut">
+                                            <ic:ChangePropertyAction x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationButtonSignOut"
+                                                                     PropertyName="Content"/>
                                         </ic:DataTriggerBehavior>
                                     </i:Interaction.Behaviors>
                                 </Button>
                             </ic:ChangePropertyAction.Value>
                         </ic:ChangePropertyAction>
                     </ic:DataTriggerBehavior>
-                    <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource EnumToStringConverter}}"
+                    <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}"
                                             ComparisonCondition="Equal"
                                             Value="Loading">
-                        <ic:ChangePropertyAction PropertyName="Description"
-                                                 Value="Loading..."/>
+                        <ic:ChangePropertyAction x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationDescriptionLoading"
+                                                 PropertyName="Description"/>
                         <ic:ChangePropertyAction PropertyName="Content">
                             <ic:ChangePropertyAction.Value>
                                 <ProgressRing Width="20" 
diff --git a/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml.cs
new file mode 100644
index 0000000..8fb837d
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml.cs
@@ -0,0 +1,18 @@
+using Microsoft.UI.Xaml.Controls;
+using VDownload.Core.ViewModels.Authentication;
+
+namespace VDownload.Core.Views.Authentication
+{
+    public sealed partial class AuthenticationView : Page
+    {
+        #region CONSTRUCTORS
+
+        public AuthenticationView(AuthenticationViewModel viewModel)
+        {
+            this.InitializeComponent();
+            this.DataContext = viewModel;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload/MainWindow.xaml b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml
similarity index 70%
rename from VDownload/MainWindow.xaml
rename to VDownload.Core/VDownload.Core.Views/BaseWindow.xaml
index 4546131..502fbc3 100644
--- a/VDownload/MainWindow.xaml
+++ b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml
@@ -1,53 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Window
-    x:Class="VDownload.MainWindow"
+    x:Class="VDownload.Core.Views.BaseWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:i="using:Microsoft.Xaml.Interactivity" 
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
     xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
-    xmlns:cb="using:VDownload.GUI.Customs.Behaviors"
+    xmlns:cb="using:VDownload.Toolkit.UI.Behaviors"
     mc:Ignorable="d">
     <Window.SystemBackdrop>
         <MicaBackdrop Kind="Base"/>
     </Window.SystemBackdrop>
-    <Grid x:Name="RootPanel" Loaded="RootPanel_Loaded">
+    <Grid x:Name="Root"
+          Loaded="Root_Loaded">
         <Border x:Name="AppTitleBar"
                 IsHitTestVisible="True"
                 VerticalAlignment="Top"
-                Background="Transparent"
                 Height="40"
                 Canvas.ZIndex="1" 
                 Margin="55,4,0,0">
             <StackPanel Orientation="Horizontal">
-                <Image x:Name="TitleBarIcon"
-                       HorizontalAlignment="Left" 
+                <Image HorizontalAlignment="Left" 
                        VerticalAlignment="Center"
                        Source="{StaticResource ImageLogo}"
                        Width="16" 
                        Height="16"/>
-                <TextBlock x:Name="TitleBarTextBlock"
-                           Text="VDownload"
+                <TextBlock Text="VDownload"
                            VerticalAlignment="Center"
                            Margin="12, 0, 0, 0"
-                           Style="{StaticResource CaptionTextBlockStyle}" />
+                           Style="{StaticResource CaptionTextBlockStyle}"/>
             </StackPanel>
         </Border>
-        <NavigationView x:Name="NavigationView"
-                        IsTitleBarAutoPaddingEnabled="True"            
+        <NavigationView IsTitleBarAutoPaddingEnabled="True"            
                         IsBackButtonVisible="Collapsed"
                         PaneDisplayMode="LeftCompact"
                         Canvas.ZIndex="0"
-                        Background="Transparent"
                         MenuItemsSource="{Binding Items}"
                         FooterMenuItemsSource="{Binding FooterItems}"
-                        SelectedItem="{Binding SelectedItem}">
+                        SelectedItem="{Binding SelectedItem}"
+                        Background="Transparent">
             <i:Interaction.Behaviors>
                 <cb:EventToCommandBehavior Command="{Binding NavigateCommand}" 
-                                           Event="ItemInvoked" 
-                                           PassArguments="True"/>
+                               Event="ItemInvoked" 
+                               PassArguments="True"/>
             </i:Interaction.Behaviors>
             <NavigationView.Resources>
                 <SolidColorBrush x:Key="NavigationViewContentBackground" 
@@ -65,11 +61,6 @@
             <Frame Margin="0,48,0,0" 
                    CornerRadius="10" 
                    Content="{Binding CurrentViewModel, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource ViewModelToViewConverter}}">
-                <Frame.ContentTransitions>
-                    <TransitionCollection>
-                        <ContentThemeTransition/>
-                    </TransitionCollection>
-                </Frame.ContentTransitions>
             </Frame>
         </NavigationView>
     </Grid>
diff --git a/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml.cs b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml.cs
new file mode 100644
index 0000000..c6dcf97
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml.cs
@@ -0,0 +1,59 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using VDownload.Core.ViewModels;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace VDownload.Core.Views
+{
+    public sealed partial class BaseWindow : Window
+    {
+        #region PROPERTIES
+
+        public XamlRoot XamlRoot => this.Root.XamlRoot;
+
+        #endregion
+
+
+
+        #region EVENTS
+
+        public event EventHandler RootLoaded;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public BaseWindow(BaseViewModel viewModel)
+        {
+            this.InitializeComponent();
+
+            this.ExtendsContentIntoTitleBar = true;
+            this.SetTitleBar(this.AppTitleBar);
+            
+            this.Root.DataContext = viewModel;
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private void Root_Loaded(object sender, RoutedEventArgs e) => RootLoaded?.Invoke(this, EventArgs.Empty);
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
new file mode 100644
index 0000000..a0a5bc0
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="VDownload.Core.Views.Home.HomeDownloadsView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:VDownload.Core.Views.Home"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:i="using:Microsoft.Xaml.Interactivity" 
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:m="using:VDownload.Models"
+    xmlns:ct="using:CommunityToolkit.WinUI"
+    xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
+    xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:ctb="using:CommunityToolkit.WinUI.Behaviors"
+    mc:Ignorable="d"
+    x:Name="Root"
+    Background="Transparent">
+    <ctuc:SwitchPresenter Value="{Binding TaskListIsEmpty, Converter={StaticResource ObjectToStringConverter}}">
+        <ctuc:Case Value="True">
+            <StackPanel HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                <Image Source="{StaticResource ImageHomeDownloadsViewNoTasks}"
+                       Width="100"/>
+                <TextBlock Text="Click Video/Playlist search button to add new tasks" 
+                           Foreground="{StaticResource GreyText}"/>
+            </StackPanel>
+        </ctuc:Case>
+        <ctuc:Case Value="False">
+            <ScrollViewer>
+                <ItemsControl ItemsSource="{Binding Tasks}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Background="{ThemeResource ViewBackgroundColor}"
+                                  CornerRadius="10"
+                                  Height="150"
+                                  Margin="0,0,0,10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Image Grid.Column="0" 
+                                           Source="{Binding Video.ThumbnailUrl}" 
+                                           VerticalAlignment="Stretch"/>
+                                    <Grid Grid.Column="1"
+                                          Margin="10"
+                                          RowSpacing="10">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition/>
+                                        </Grid.RowDefinitions>
+                                        <Grid Grid.Row="0"
+                                              ColumnSpacing="10" 
+                                              HorizontalAlignment="Left">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition Width="Auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Grid.Column="0" 
+                                                       FontWeight="SemiBold"
+                                                       FontSize="18"
+                                                       Text="{Binding Video.Title}"
+                                                       TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock Grid.Column="1" 
+                                                       VerticalAlignment="Center"
+                                                       FontWeight="Light"
+                                                       FontSize="12"
+                                                       Text="{Binding Video.Author}"/>
+                                        </Grid>
+                                        <Grid Grid.Row="1" 
+                                              RowSpacing="10" 
+                                              ColumnSpacing="10">
+                                            <Grid.Resources>
+                                                <x:Double x:Key="TextSize">12</x:Double>
+                                            </Grid.Resources>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <Image Grid.Row="0"
+                                                   Grid.Column="0"
+                                                   Source="{ThemeResource ImageHomeDownloadsViewQuality}"/>
+                                            <StackPanel Grid.Row="0"
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Orientation="Horizontal">
+                                                <ctuc:SwitchPresenter Value="{Binding DownloadOptions.MediaType, Converter={StaticResource ObjectToStringConverter}}">
+                                                    <ctuc:Case Value="Original">
+                                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOriginal"
+                                                                   FontSize="{StaticResource TextSize}"/>
+                                                    </ctuc:Case>
+                                                    <ctuc:Case Value="OnlyVideo">
+                                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOnlyVideo"
+                                                                   FontSize="{StaticResource TextSize}"/>
+                                                    </ctuc:Case>
+                                                    <ctuc:Case Value="OnlyAudio">
+                                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOnlyAudio"
+                                                                   FontSize="{StaticResource TextSize}"/>
+                                                    </ctuc:Case>
+                                                </ctuc:SwitchPresenter>
+                                                <TextBlock FontSize="{StaticResource TextSize}">
+                                                    <Run Text=" ("/><Run Text="{Binding DownloadOptions.SelectedStream.Name}"/>)
+                                                </TextBlock>
+                                            </StackPanel>
+                                            <Image Grid.Row="1"
+                                                   Grid.Column="0"
+                                                   Source="{ThemeResource ImageHomeDownloadsViewTime}"/>
+                                            <StackPanel Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        Orientation="Horizontal"
+                                                        VerticalAlignment="Center">
+                                                <TextBlock Text="{Binding DownloadOptions.DurationAfterTrim}"
+                                                           FontSize="{StaticResource TextSize}"/>
+                                                <TextBlock Visibility="{Binding DownloadOptions.IsTrimmed, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                           FontSize="{StaticResource TextSize}">
+                                                    <Run Text=" "/>(<Run Text="{Binding DownloadOptions.TrimStart}"/> - <Run Text="{Binding DownloadOptions.TrimEnd}"/>)
+                                                </TextBlock>
+                                            </StackPanel>
+                                            <Image Grid.Row="2"
+                                                   Grid.Column="0"
+                                                   Source="{ThemeResource ImageHomeDownloadsViewFile}"/>
+											<TextBlock Grid.Row="2"
+                                                       Grid.Column="1"
+                                                       FontSize="{StaticResource TextSize}"
+                                                       VerticalAlignment="Center">
+												<Run Text="{Binding DownloadOptions.Directory}"/>\<Run Text="{Binding DownloadOptions.Filename}"/>.<Run Text="{Binding DownloadOptions.Extension}"/>
+											</TextBlock>
+                                            <Image Grid.Row="3"
+                                                   Grid.Column="0">
+                                                <i:Interaction.Behaviors>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Idle">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewIdle}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Queued">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewQueued}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Initializing">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewInitializing}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Downloading">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewDownloading}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Processing">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewProcessing}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Finalizing">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewFinalizing}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedUnsuccessfully">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewError}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedSuccessfully">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewDone}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedCancelled">
+                                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                                 Value="{ThemeResource ImageHomeDownloadsViewCancelled}"/>
+                                                    </ic:DataTriggerBehavior>
+                                                </i:Interaction.Behaviors>
+                                            </Image>
+                                            <Border Grid.Row="3"
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center">
+                                                <i:Interaction.Behaviors>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Idle">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusIdle" 
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Queued">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusQueued" 
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Initializing">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusInitializing" 
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Downloading">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <StackPanel Orientation="Horizontal">
+                                                                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusDownloading"
+                                                                               FontSize="{StaticResource TextSize}"/>
+                                                                    <TextBlock Text="{Binding Progress, Converter={StaticResource StringFormatConverter}, ConverterParameter='{} ({0:0.##}%)'}"
+                                                                               FontSize="{StaticResource TextSize}"/>
+                                                                </StackPanel>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Processing">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock FontSize="{StaticResource TextSize}">
+                                                                    <Run x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusProcessing"/><Run Text=" ("/><Run Text="{Binding Progress, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:0.##}'}"/>%)
+                                                                </TextBlock>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="Finalizing">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusFinalizing"
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedUnsuccessfully">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock FontSize="{StaticResource TextSize}">
+                                                                    <Run x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusError"/><Run Text=" ("/><Run Text="{Binding Error}"/>)
+                                                                </TextBlock>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedSuccessfully">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusDone"
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToStringConverter}}"
+                                                                            ComparisonCondition="Equal"
+                                                                            Value="EndedCancelled">
+                                                        <ic:ChangePropertyAction PropertyName="Child">
+                                                            <ic:ChangePropertyAction.Value>
+                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusCancelled"
+                                                                           FontSize="{StaticResource TextSize}"/>
+                                                            </ic:ChangePropertyAction.Value>
+                                                        </ic:ChangePropertyAction>
+                                                    </ic:DataTriggerBehavior>
+                                                </i:Interaction.Behaviors>
+                                            </Border>
+                                        </Grid>
+                                    </Grid>
+                                    <Grid Grid.Column="2"
+                                      Margin="0,0,5,0">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition/>
+                                            <RowDefinition/>
+                                            <RowDefinition/>
+                                        </Grid.RowDefinitions>
+                                        <AppBarButton Grid.Row="0" 
+                                                  Width="40" 
+                                                  Height="48">
+                                            <i:Interaction.Behaviors>
+                                                <ic:EventTriggerBehavior EventName="Click">
+                                                    <ctb:NavigateToUriAction NavigateUri="{Binding Video.Url}"/>
+                                                </ic:EventTriggerBehavior>
+                                                <ic:DataTriggerBehavior Binding="{Binding Video.Source, Converter={StaticResource ObjectToStringConverter}}"
+                                                                        ComparisonCondition="Equal"
+                                                                        Value="Twitch">
+                                                    <ic:ChangePropertyAction PropertyName="Icon">
+                                                        <ic:ChangePropertyAction.Value>
+                                                            <BitmapIcon ShowAsMonochrome="False" 
+                                                                    UriSource="{StaticResource ImageSourcesTwitch}"/>
+                                                        </ic:ChangePropertyAction.Value>
+                                                    </ic:ChangePropertyAction>
+                                                </ic:DataTriggerBehavior>
+                                            </i:Interaction.Behaviors>
+                                        </AppBarButton>
+                                        <AppBarButton Grid.Row="1" 
+                                                  Width="40" 
+                                                  Height="48"
+                                                  Command="{Binding ElementName=Root, Path=DataContext.StartCancelTaskCommand}"
+                                                  CommandParameter="{Binding}">
+                                            <i:Interaction.Behaviors>
+                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                                    ComparisonCondition="LessThan"
+                                                                    Value="4">
+                                                    <ic:ChangePropertyAction PropertyName="Icon">
+                                                        <ic:ChangePropertyAction.Value>
+                                                            <SymbolIcon Symbol="Download"/>
+                                                        </ic:ChangePropertyAction.Value>
+                                                    </ic:ChangePropertyAction>
+                                                </ic:DataTriggerBehavior>
+                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                                    ComparisonCondition="GreaterThanOrEqual"
+                                                                    Value="4">
+                                                    <ic:ChangePropertyAction PropertyName="Icon">
+                                                        <ic:ChangePropertyAction.Value>
+                                                            <SymbolIcon Symbol="Cancel"/>
+                                                        </ic:ChangePropertyAction.Value>
+                                                    </ic:ChangePropertyAction>
+                                                </ic:DataTriggerBehavior>
+                                            </i:Interaction.Behaviors>
+                                        </AppBarButton>
+                                        <AppBarButton Grid.Row="2" 
+                                                  Icon="Delete" 
+                                                  Width="40" 
+                                                  Height="48"
+                                                  Command="{Binding ElementName=Root, Path=DataContext.RemoveTaskCommand}"
+                                                  CommandParameter="{Binding}"/>
+                                    </Grid>
+                                </Grid>
+                                <ProgressBar Grid.Row="1"
+                                         Value="{Binding Progress}"
+                                         Maximum="100">
+                                    <i:Interaction.Behaviors>
+                                        <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                        ComparisonCondition="LessThan"
+                                                        Value="5">
+                                            <ic:ChangePropertyAction PropertyName="Visibility" Value="Collapsed"/>
+                                        </ic:DataTriggerBehavior>
+                                        <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                        ComparisonCondition="GreaterThanOrEqual"
+                                                        Value="5">
+                                            <ic:ChangePropertyAction PropertyName="Visibility" Value="Visible"/>
+                                        </ic:DataTriggerBehavior>
+                                        <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                            ComparisonCondition="LessThan"
+                                                            Value="7">
+                                            <ic:ChangePropertyAction PropertyName="IsIndeterminate" Value="True"/>
+                                        </ic:DataTriggerBehavior>
+                                        <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource ObjectToIntConverter}}"
+                                                            ComparisonCondition="GreaterThanOrEqual"
+                                                            Value="7">
+                                            <ic:ChangePropertyAction PropertyName="IsIndeterminate" Value="False"/>
+                                        </ic:DataTriggerBehavior>
+                                    </i:Interaction.Behaviors>
+                                </ProgressBar>
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </ctuc:Case>
+    </ctuc:SwitchPresenter>
+
+</Page>
diff --git a/VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml.cs
similarity index 75%
rename from VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml.cs
rename to VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml.cs
index 3708b6a..18e1b93 100644
--- a/VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml.cs
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml.cs
@@ -10,17 +10,17 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
-using VDownload.GUI.ViewModels;
+using VDownload.Core.ViewModels.Home;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-namespace VDownload.GUI.Views
+namespace VDownload.Core.Views.Home
 {
-    public sealed partial class SettingsView : Page
+    public sealed partial class HomeDownloadsView : Page
     {
         #region CONSTRUCTORS
 
-        public SettingsView(SettingsViewModel viewModel)
+        public HomeDownloadsView(HomeDownloadsViewModel viewModel)
         {
             this.InitializeComponent();
             this.DataContext = viewModel;
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
new file mode 100644
index 0000000..4e162e2
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="VDownload.Core.Views.Home.HomeVideoView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:VDownload.Core.Views.Home"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:i="using:Microsoft.Xaml.Interactivity" 
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:m="using:VDownload.Models"
+    xmlns:ct="using:CommunityToolkit.WinUI"
+    xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
+    xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:c="using:VDownload.Toolkit.UI.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ViewBackgroundColor}">
+
+    <Grid Padding="15" 
+          RowSpacing="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="150"/>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0"
+              ColumnSpacing="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Grid.Column="0"
+                    CornerRadius="{ThemeResource ControlCornerRadius}">
+                <Image Source="{Binding ThumbnailUrl}"
+                       VerticalAlignment="Stretch"/>
+            </Border>
+            <StackPanel Grid.Column="1" 
+                    Spacing="15">
+                <TextBlock Text="{Binding Title}"
+                       FontWeight="Bold"
+                       FontSize="20"
+                       TextWrapping="WrapWholeWords"/>
+                <Grid ColumnSpacing="10"
+                      RowSpacing="10">
+                    <Grid.Resources>
+                        <x:Double x:Key="IconSize">18</x:Double>
+                    </Grid.Resources>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Image Grid.Column="0"
+                           Grid.Row="0"
+                           Source="{ThemeResource ImageHomeVideoViewAuthor}"
+                           Width="{StaticResource IconSize}"/>
+                    <TextBlock Grid.Column="1"
+                               Grid.Row="0"
+                               Text="{Binding Author}"/>
+                    <Image Grid.Column="0"
+                           Grid.Row="1"
+                           Source="{ThemeResource ImageHomeVideoViewDate}"
+                           Width="{StaticResource IconSize}"/>
+                    <TextBlock Grid.Column="1"
+                               Grid.Row="1"
+                               Text="{Binding PublishDate}"/>
+                    <Image Grid.Column="0"
+                           Grid.Row="2"
+                           Source="{ThemeResource ImageHomeVideoViewTime}"
+                           Width="{StaticResource IconSize}"/>
+                    <TextBlock Grid.Column="1"
+                               Grid.Row="2"
+                               Text="{Binding Duration}"/>
+                    <Image Grid.Column="0"
+                           Grid.Row="3"
+                           Source="{ThemeResource ImageHomeVideoViewViews}"
+                           Width="{StaticResource IconSize}"/>
+                    <TextBlock Grid.Column="1"
+                               Grid.Row="3"
+                               Text="{Binding Views}"/>
+                </Grid>
+            </StackPanel>
+        </Grid>
+        <ScrollViewer Grid.Row="1">
+            <StackPanel Spacing="20">
+                <StackPanel Spacing="5">
+                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaOptionsHeader"
+                               FontWeight="Bold"
+                               FontSize="15"/>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/QualitySettingsCard">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewQuality}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <ComboBox ItemsSource="{Binding Streams}"
+                                  SelectedItem="{Binding SelectedStream, Mode=TwoWay}">
+                            <!-- ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate -->
+                        </ComboBox>
+                    </ctc:SettingsCard>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeSettingsCard">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewMedia}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}"
+                                  SelectedItem="{Binding MediaType, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
+                                        <ctuc:Case Value="Original">
+                                            <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOriginal"/>
+                                        </ctuc:Case>
+                                        <ctuc:Case Value="OnlyVideo">
+                                            <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOnlyVideo"/>
+                                        </ctuc:Case>
+                                        <ctuc:Case Value="OnlyAudio">
+                                            <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOnlyAudio"/>
+                                        </ctuc:Case>
+                                    </ctuc:SwitchPresenter>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </ctc:SettingsCard>
+                    <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimSettingsGroup">
+                        <ctc:SettingsExpander.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewTrim}"/>
+                        </ctc:SettingsExpander.HeaderIcon>
+                        <ctc:SettingsExpander.Items>
+                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimStartSettingsCard">
+                                <c:TimeSpanControl Value="{Binding TrimStart, Mode=TwoWay}" 
+                                                    Maximum="{Binding TrimEnd, Mode=OneWay}"/>
+                            </ctc:SettingsCard>
+                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimEndSettingsCard">
+                                <c:TimeSpanControl Minimum="{Binding TrimStart, Mode=OneWay}" 
+                                                    Value="{Binding TrimEnd, Mode=TwoWay}" 
+                                                    Maximum="{Binding Duration, Mode=OneWay}"/>
+                            </ctc:SettingsCard>
+                        </ctc:SettingsExpander.Items>
+                    </ctc:SettingsExpander>
+                </StackPanel>
+                <StackPanel Spacing="5">
+                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FileOptionsHeader"
+                               FontWeight="Bold"
+                               FontSize="15"/>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/DirectorySettingsCard"
+                                      Description="{Binding DirectoryPath}">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewDirectory}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/DirectorySettingsCardButton"
+                                Command="{Binding BrowseCommand}"/>
+                    </ctc:SettingsCard>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FilenameSettingsCard">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewFilename}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <TextBox Text="{Binding Filename, Mode=TwoWay}"/>
+                    </ctc:SettingsCard>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FileTypeSettingsCard">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageHomeVideoViewExtension}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <i:Interaction.Behaviors>
+                            <ic:DataTriggerBehavior Binding="{Binding MediaType, Converter={StaticResource ObjectToStringConverter}}"
+                                                    ComparisonCondition="Equal"
+                                                    Value="OnlyAudio">
+                                <ic:ChangePropertyAction PropertyName="Content">
+                                    <ic:ChangePropertyAction.Value>
+                                        <ComboBox ItemsSource="{ct:EnumValues Type=m:AudioExtension}"
+                                                  SelectedItem="{Binding AudioExtension, Mode=TwoWay}">
+                                            <ComboBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding}"/>
+                                                </DataTemplate>
+                                            </ComboBox.ItemTemplate>
+                                        </ComboBox>
+                                    </ic:ChangePropertyAction.Value>
+                                </ic:ChangePropertyAction>
+                            </ic:DataTriggerBehavior>
+                            <ic:DataTriggerBehavior Binding="{Binding MediaType, Converter={StaticResource ObjectToStringConverter}}"
+                                                    ComparisonCondition="NotEqual"
+                                                    Value="OnlyAudio">
+                                <ic:ChangePropertyAction PropertyName="Content">
+                                    <ic:ChangePropertyAction.Value>
+                                        <ComboBox ItemsSource="{ct:EnumValues Type=m:VideoExtension}"
+                                                  SelectedItem="{Binding VideoExtension, Mode=TwoWay}">
+                                            <ComboBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding}"/>
+                                                </DataTemplate>
+                                            </ComboBox.ItemTemplate>
+                                        </ComboBox>
+                                    </ic:ChangePropertyAction.Value>
+                                </ic:ChangePropertyAction>
+                            </ic:DataTriggerBehavior>
+                        </i:Interaction.Behaviors>
+                    </ctc:SettingsCard>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+        <StackPanel Grid.Row="2"
+                    HorizontalAlignment="Right"
+                    Orientation="Horizontal"
+                    Spacing="10">
+            <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/CreateAndStartButton"
+                    Command="{Binding CreateTaskAndDownloadCommand}"/>
+            <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/CreateButton"
+                    Style="{StaticResource AccentButtonStyle}" 
+                    Command="{Binding CreateTaskCommand}"/>
+        </StackPanel>
+        
+    </Grid>
+</Page>
diff --git a/VDownload.GUI/VDownload.GUI.Views/HomeView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml.cs
similarity index 76%
rename from VDownload.GUI/VDownload.GUI.Views/HomeView.xaml.cs
rename to VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml.cs
index 4e0e66e..cc9c57a 100644
--- a/VDownload.GUI/VDownload.GUI.Views/HomeView.xaml.cs
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml.cs
@@ -10,17 +10,17 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
-using VDownload.GUI.ViewModels;
+using VDownload.Core.ViewModels.Home;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-namespace VDownload.GUI.Views
+namespace VDownload.Core.Views.Home
 {
-    public sealed partial class HomeView : Page
+    public sealed partial class HomeVideoView : Page
     {
         #region CONSTRUCTORS
 
-        public HomeView(HomeViewModel viewModel)
+        public HomeVideoView(HomeVideoViewModel viewModel)
         {
             this.InitializeComponent();
             this.DataContext = viewModel;
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
new file mode 100644
index 0000000..aaf06cf
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="VDownload.Core.Views.Home.HomeView"
+    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:i="using:Microsoft.Xaml.Interactivity" 
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d"
+    Background="Transparent"
+    x:Name="Root">
+    <i:Interaction.Behaviors>
+        <ic:EventTriggerBehavior EventName="Loaded">
+            <ic:InvokeCommandAction Command="{Binding NavigationCommand}"/>
+        </ic:EventTriggerBehavior>
+    </i:Interaction.Behaviors>
+    <Grid RowSpacing="10"
+          Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Frame Content="{Binding MainContent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource ViewModelToViewConverter}}">
+            
+        </Frame>
+        <Grid Grid.Row="1"
+              Background="{ThemeResource OptionBarBackgroundColor}"
+              CornerRadius="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="50"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <ctuc:UniformGrid Grid.Column="0" 
+                              Rows="1" 
+                              Margin="15,0,0,0">
+                <ctuc:UniformGrid.RowDefinitions>
+                    <RowDefinition/>
+                </ctuc:UniformGrid.RowDefinitions>
+                <ctuc:UniformGrid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </ctuc:UniformGrid.ColumnDefinitions>
+                <ctuc:SwitchPresenter Grid.Row="0" 
+                                      VerticalAlignment="Stretch" 
+                                      Margin="0,0,15,0" 
+                                      Value="{Binding OptionBarContent, Converter={StaticResource ObjectToStringConverter}}">
+                    <i:Interaction.Behaviors>
+                        <ic:DataTriggerBehavior Binding="{Binding OptionBarContent, Converter={StaticResource ObjectToStringConverter}}"
+                                                ComparisonCondition="Equal"
+                                                Value="None">
+                            <ic:ChangePropertyAction PropertyName="Visibility"
+                                                     Value="Collapsed"/>
+                        </ic:DataTriggerBehavior>
+                        <ic:DataTriggerBehavior Binding="{Binding OptionBarContent, Converter={StaticResource ObjectToStringConverter}}"
+                                                ComparisonCondition="NotEqual"
+                                                Value="None">
+                            <ic:ChangePropertyAction PropertyName="Visibility"
+                                                     Value="Visible"/>
+                        </ic:DataTriggerBehavior>
+                    </i:Interaction.Behaviors>
+                    <ctuc:Case Value="VideoSearch">
+                        <Grid ColumnSpacing="10" 
+                              VerticalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarVideoSearchContentTextBox"
+                                     Grid.Column="0"
+                                     VerticalAlignment="Center"
+                                     Text="{Binding OptionBarVideoSearchTBValue, Mode=TwoWay}"/>
+                            <Button x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarSearchButton"
+                                    Grid.Column="1"
+                                    IsEnabled="{Binding OptionBarSearchNotPending}"
+                                    Command="{Binding VideoSearchStartCommand}"/>
+                        </Grid>
+                    </ctuc:Case>
+                    <ctuc:Case Value="PlaylistSearch">
+                        <Grid ColumnSpacing="10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearchContentTextBox"
+                                     Grid.Column="0" 
+                                     VerticalAlignment="Center"
+                                     Text="{Binding OptionBarPlaylistSearchTBValue, Mode=TwoWay}"/>
+                            <NumberBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearchContentNumberBox"
+                                       Grid.Column="1" 
+                                       VerticalAlignment="Center"
+                                       SpinButtonPlacementMode="Compact" 
+                                       SmallChange="1" 
+                                       LargeChange="10" 
+                                       Value="{Binding OptionBarPlaylistSearchNBValue, Mode=TwoWay}"
+                                       Minimum="0"/>
+                            <Button x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarSearchButton"
+                                    Grid.Column="2"
+                                    IsEnabled="{Binding OptionBarSearchNotPending}"
+                                    Command="{Binding PlaylistSearchStartCommand}"/>
+                        </Grid>
+                    </ctuc:Case>
+                </ctuc:SwitchPresenter>
+                <StackPanel VerticalAlignment="Center" 
+                            Orientation="Horizontal">
+                    <ProgressRing Width="20" 
+                                  Height="20" 
+                                  Margin="0,0,10,0"
+                                  Visibility="{Binding OptionBarLoading, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    <TextBlock Text="{Binding OptionBarMessage}"/>
+                </StackPanel>
+            </ctuc:UniformGrid>
+            <StackPanel Grid.Column="2" 
+                        Orientation="Horizontal">
+                <AppBarButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarLoadSubscription"
+                              Icon="Favorite"
+                              IsEnabled="{Binding OptionBarSearchNotPending}"
+                              Command="{Binding LoadFromSubscriptionCommand}"/>
+                <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarVideoSearch"
+                                    Icon="Video"
+                                    IsEnabled="{Binding OptionBarSearchNotPending}"
+                                    IsChecked="{Binding OptionBarVideoSearchButtonChecked, Mode=TwoWay}"
+                                    Command="{Binding VideoSearchShowCommand}"/>
+                <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearch"
+                                    Icon="List"
+                                    IsEnabled="{Binding OptionBarSearchNotPending}"
+                                    IsChecked="{Binding OptionBarPlaylistSearchButtonChecked, Mode=TwoWay}"
+                                    Command="{Binding PlaylistSearchShowCommand}"/>
+                <AppBarSeparator/>
+                <AppBarButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarDownloadAll"
+                              Icon="Download"
+                              Command="{Binding DownloadCommand}"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml.cs
new file mode 100644
index 0000000..b27b4a4
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml.cs
@@ -0,0 +1,18 @@
+using Microsoft.UI.Xaml.Controls;
+using VDownload.Core.ViewModels.Home;
+
+namespace VDownload.Core.Views.Home
+{
+    public sealed partial class HomeView : Page
+    {
+        #region CONSTRUCTORS
+
+        public HomeView(HomeViewModel viewModel)
+        {
+            this.InitializeComponent();
+            this.DataContext = viewModel;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
similarity index 77%
rename from VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml
rename to VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
index 3d206ae..1b000e8 100644
--- a/VDownload.GUI/VDownload.GUI.Views/SettingsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="VDownload.GUI.Views.SettingsView"
+    x:Class="VDownload.Core.Views.Settings.SettingsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.GUI.Views"
+    xmlns:local="using:VDownload.Core.Views.Settings"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid>
-        <TextBlock Text="Settings"/>
+
     </Grid>
 </Page>
diff --git a/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml.cs
new file mode 100644
index 0000000..9ad360f
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml.cs
@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml.Controls;
+using VDownload.Core.ViewModels.Settings;
+
+namespace VDownload.Core.Views.Settings
+{
+    public sealed partial class SettingsView : Page
+    {
+        #region PROPERTIES
+
+        public new SettingsViewModel DataContext { get; set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public SettingsView(SettingsViewModel viewModel)
+        {
+            this.InitializeComponent();
+            this.DataContext = viewModel;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
new file mode 100644
index 0000000..43efa2d
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
@@ -0,0 +1,81 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>VDownload.Core.Views</RootNamespace>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
+	  <UseRidGraph>true</UseRidGraph>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
+      <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.240109" />
+      <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+      <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+      <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Behaviors\VDownload.Toolkit.UI.Behaviors.csproj" />
+    <ProjectReference Include="..\..\VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Controls\VDownload.Toolkit.UI.Controls.csproj" />
+    <ProjectReference Include="..\VDownload.Core.Strings\VDownload.Core.Strings.csproj" />
+    <ProjectReference Include="..\VDownload.Core.ViewModels\VDownload.Core.ViewModels.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Authentication\AuthenticationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+    <None Update="BaseWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+    <None Update="Home\HomeDownloadsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+    <None Update="Home\HomeVideoView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+    <None Update="Settings\SettingsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Home\HomeVideoView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="BaseWindow.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Home\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Home\HomeDownloadsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Authentication\AuthenticationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Settings\SettingsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+</Project>
diff --git a/VDownload.GUI/VDownload.GUI.Converters/ViewModelToViewConverter.cs b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
similarity index 52%
rename from VDownload.GUI/VDownload.GUI.Converters/ViewModelToViewConverter.cs
rename to VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
index 77a864f..7bafd1b 100644
--- a/VDownload.GUI/VDownload.GUI.Converters/ViewModelToViewConverter.cs
+++ b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
@@ -1,15 +1,15 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.GUI.ViewModels;
-using VDownload.GUI.Views;
-using VDownload.Services;
+using VDownload.Core.ViewModels.Authentication;
+using VDownload.Core.ViewModels.Home;
+using VDownload.Core.ViewModels.Settings;
+using VDownload.Core.Views.Authentication;
+using VDownload.Core.Views.Home;
+using VDownload.Core.Views.Settings;
 
-namespace VDownload.GUI.Converters
+namespace VDownload.Core.Views
 {
     public class ViewModelToViewConverter : IValueConverter
     {
@@ -18,21 +18,25 @@ namespace VDownload.GUI.Converters
         private readonly Dictionary<Type, Type> _viewModelViewBinding = new Dictionary<Type, Type>
         {
             { typeof(HomeViewModel), typeof(HomeView) },
+            { typeof(HomeDownloadsViewModel), typeof(HomeDownloadsView) },
+            { typeof(HomeVideoViewModel), typeof(HomeVideoView) },
             { typeof(SettingsViewModel), typeof(SettingsView) },
             { typeof(AuthenticationViewModel), typeof(AuthenticationView) }
         };
-        private readonly Dictionary<Type, Type> _viewViewModelBinding = new Dictionary<Type, Type>
-        {
-            { typeof(HomeView), typeof(HomeViewModel) },
-            { typeof(SettingsView), typeof(SettingsViewModel) },
-            { typeof(AuthenticationView), typeof(AuthenticationViewModel) }
-        };
 
         #endregion
 
 
 
-        #region METHODS
+        #region PROPERTIES
+
+        public static IServiceProvider ServiceProvider { protected get; set; }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -42,20 +46,21 @@ namespace VDownload.GUI.Converters
             }
             if (value is Type type && _viewModelViewBinding.ContainsKey(type))
             {
-                return ServiceProvider.Instance.GetService(_viewModelViewBinding[type]);
+                return ServiceProvider.GetService(_viewModelViewBinding[type]);
             }
             if (_viewModelViewBinding.ContainsKey(value.GetType()))
             {
-                return ServiceProvider.Instance.GetService(_viewModelViewBinding[value.GetType()]);
+                return ServiceProvider.GetService(_viewModelViewBinding[value.GetType()]);
             }
             return null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
-            if (_viewViewModelBinding.ContainsKey(value.GetType()))
+            Dictionary<Type, Type> viewViewModelBinding = _viewModelViewBinding.ToDictionary(x => x.Value, x => x.Key);
+            if (viewViewModelBinding.ContainsKey(value.GetType()))
             {
-                return _viewViewModelBinding[value.GetType()];
+                return viewViewModelBinding[value.GetType()];
             }
             return null;
         }
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthConverter.cs
deleted file mode 100644
index e2b9f65..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToGridLengthConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            GridLength notVisibleLength = new GridLength(0);
-            if (value is bool visible)
-            {
-                GridLength visibleLength = new GridLength(1, GridUnitType.Star);
-                if (parameter is string width)
-                {
-                    if (width.ToLower() == "auto")
-                    {
-                        visibleLength = GridLength.Auto;
-                    }
-                    else if (int.TryParse(width, out int result))
-                    {
-                        visibleLength = new GridLength(result);
-                    }
-                }
-                return visible ? visibleLength : notVisibleLength;
-            }
-            return notVisibleLength;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillConverter.cs
deleted file mode 100644
index a5054e9..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillConverter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToGridLengthFillConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            GridLength falseLength = GridLength.Auto;
-            if (value is bool boolean)
-            {
-                GridLength trueLength = new GridLength(1, GridUnitType.Star);
-                return boolean ? trueLength : falseLength;
-            }
-            return falseLength;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillReversedConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillReversedConverter.cs
deleted file mode 100644
index 8e74f72..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthFillReversedConverter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToGridLengthFillReversedConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            GridLength falseLength = GridLength.Auto;
-            if (value is bool boolean)
-            {
-                GridLength trueLength = new GridLength(1, GridUnitType.Star);
-                return boolean ? falseLength : trueLength;
-            }
-            return falseLength;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthReversedConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthReversedConverter.cs
deleted file mode 100644
index efac55f..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToGridLengthReversedConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToGridLengthReversedConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            GridLength visibleLength = new GridLength(1, GridUnitType.Star);
-            if (value is bool visible)
-            {
-                GridLength notVisibleLength = new GridLength(0);
-                if (parameter is string width)
-                {
-                    if (width.ToLower() == "auto")
-                    {
-                        visibleLength = GridLength.Auto;
-                    }
-                    else if (int.TryParse(width, out int result))
-                    {
-                        visibleLength = new GridLength(result);
-                    }
-                }
-                return visible ? notVisibleLength : visibleLength;
-            }
-            return visibleLength;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToStringConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToStringConverter.cs
deleted file mode 100644
index a5438ae..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToStringConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is bool boolean)
-            {
-                return boolean.ToString();
-            }
-            return bool.FalseString;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string str)
-            {
-                return str == bool.TrueString;
-            }
-            return false;
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/BooleanToVisibilityConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/BooleanToVisibilityConverter.cs
deleted file mode 100644
index e54129e..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/BooleanToVisibilityConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class BooleanToVisibilityConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is bool isVisible)
-            {
-                return isVisible ? Visibility.Visible : Visibility.Collapsed;
-            }
-            return Visibility.Collapsed;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Visibility visibility)
-            {
-                return visibility == Visibility.Visible;
-            }
-            return false;
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/EnumToDescriptionConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/EnumToDescriptionConverter.cs
deleted file mode 100644
index da97cb2..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/EnumToDescriptionConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class EnumToDescriptionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Enum enumValue)
-            {
-                return enumValue.GetType().GetMember(enumValue.ToString()).FirstOrDefault()?.GetCustomAttribute<DescriptionAttribute>()?.Description;
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/ReverseBooleanConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/ReverseBooleanConverter.cs
deleted file mode 100644
index 4d23356..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/ReverseBooleanConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class ReverseBooleanConverter : IValueConverter
-    {
-        #region METHODS
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is bool boolean) 
-            {
-                return !boolean;
-            }
-            return true;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language) => Convert(value, targetType, parameter, language);
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/StringToLowerConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/StringToLowerConverter.cs
deleted file mode 100644
index 4eaa966..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/StringToLowerConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class StringToLowerConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            return value.ToString().ToLower();
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/StringToUriConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/StringToUriConverter.cs
deleted file mode 100644
index b8f0fb6..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/StringToUriConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class StringToUriConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string str)
-            {
-                return new Uri(str, UriKind.RelativeOrAbsolute);
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Uri uri)
-            {
-                return uri.OriginalString;
-            }
-            return null;
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/StringToVisibilityConverter.cs b/VDownload.GUI/VDownload.GUI.Converters/StringToVisibilityConverter.cs
deleted file mode 100644
index 010b4b5..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/StringToVisibilityConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Converters
-{
-    public class StringToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is not string str || string.IsNullOrWhiteSpace(str))
-            {
-                return Visibility.Collapsed;
-            }
-            else
-            {
-                return Visibility.Visible;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Converters/VDownload.GUI.Converters.csproj b/VDownload.GUI/VDownload.GUI.Converters/VDownload.GUI.Converters.csproj
deleted file mode 100644
index 4fa0577..0000000
--- a/VDownload.GUI/VDownload.GUI.Converters/VDownload.GUI.Converters.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Converters</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services\VDownload.Services.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.ViewModels\VDownload.GUI.ViewModels.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.Views\VDownload.GUI.Views.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/VDownload.GUI/VDownload.GUI.Customs/Models/NavigationViewItem.cs b/VDownload.GUI/VDownload.GUI.Customs/Models/NavigationViewItem.cs
deleted file mode 100644
index 537c97b..0000000
--- a/VDownload.GUI/VDownload.GUI.Customs/Models/NavigationViewItem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Customs.Models
-{
-    public class NavigationViewItem 
-    {
-        #region PROPERTIES
-
-        public required string Name { get; init; }
-        public required string IconSource { get; init; }
-        public required Type ViewModel { get; init; }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ImagesResourceDictionary.cs b/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ImagesResourceDictionary.cs
deleted file mode 100644
index ca18b95..0000000
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ImagesResourceDictionary.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Services.ResourceDictionaries
-{
-    public interface IImagesResourceDictionary
-    {
-        // LOGO
-        string Logo { get; }
-
-        // SOURCES
-        string SourcesTwitch { get; }
-
-        // NAVIGATION VIEW
-        string NavigationViewAuthentication { get; }
-        string NavigationViewHome { get; }
-    }
-
-
-
-    public class ImagesResourceDictionary : IImagesResourceDictionary
-    {
-        #region PROPERTIES
-
-        // LOGO
-        public string Logo { get; private set; }
-
-        // SOURCES
-        public string SourcesTwitch { get; private set; }
-
-        // NAVIGATION VIEW
-        public string NavigationViewAuthentication { get; private set; }
-        public string NavigationViewHome { get; private set; }
-
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public ImagesResourceDictionary()
-        {
-            Logo = (string)Application.Current.Resources["ImageLogo"];
-
-            SourcesTwitch = (string)Application.Current.Resources["ImageSourcesTwitch"];
-
-            NavigationViewAuthentication = (string)Application.Current.Resources["ImageNavigationViewAuthentication"];
-            NavigationViewHome = (string)Application.Current.Resources["ImageNavigationViewHome"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ResourceDictionariesServices.cs b/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ResourceDictionariesServices.cs
deleted file mode 100644
index b287e83..0000000
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/ResourceDictionariesServices.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.GUI.Services.ResourceDictionaries
-{
-    public interface IResourceDictionariesServices
-    {
-        #region PROPERTIES
-
-        IImagesResourceDictionary Images { get; }
-
-        #endregion
-
-
-
-        #region METHODS
-
-        T Get<T>(string key);
-
-        #endregion
-    }
-
-
-
-    public class ResourceDictionariesServices : IResourceDictionariesServices
-    {
-        #region PROPERTIES
-
-        public IImagesResourceDictionary Images { get; private set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public ResourceDictionariesServices(IImagesResourceDictionary imagesResourceDictionary)
-        {
-            Images = imagesResourceDictionary;
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        public T Get<T>(string key)
-        {
-            Application.Current.Resources.TryGetValue(key, out object value);
-            if (value is not null && value is T cast)
-            {
-                return cast;
-            }
-            throw new KeyNotFoundException();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.ViewModels/VDownload.GUI.ViewModels.csproj b/VDownload.GUI/VDownload.GUI.ViewModels/VDownload.GUI.ViewModels.csproj
deleted file mode 100644
index 35a5cc3..0000000
--- a/VDownload.GUI/VDownload.GUI.ViewModels/VDownload.GUI.ViewModels.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.ViewModels</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
-  </PropertyGroup>
-
-  <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\VDownload.Common\VDownload.Common.csproj" />
-    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Search\VDownload.Services.Search.csproj" />
-    <ProjectReference Include="..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj" />
-    <ProjectReference Include="..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
-    <ProjectReference Include="..\..\VDownload.Tasks\VDownload.Tasks.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.Services\VDownload.GUI.Services.Dialog\VDownload.GUI.Services.Dialog.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.Services\VDownload.GUI.Services.StoragePicker\VDownload.GUI.Services.StoragePicker.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.Services\VDownload.GUI.Services.WebView\VDownload.GUI.Services.WebView.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml.cs b/VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml.cs
deleted file mode 100644
index 12ab8d3..0000000
--- a/VDownload.GUI/VDownload.GUI.Views/AuthenticationView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using VDownload.GUI.ViewModels;
-
-namespace VDownload.GUI.Views
-{
-    public sealed partial class AuthenticationView : Page
-    {
-        public AuthenticationView(AuthenticationViewModel viewModel)
-        {
-            this.InitializeComponent();
-            this.DataContext = viewModel;
-        }
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Views/HomeView.xaml b/VDownload.GUI/VDownload.GUI.Views/HomeView.xaml
deleted file mode 100644
index 6c5bc0c..0000000
--- a/VDownload.GUI/VDownload.GUI.Views/HomeView.xaml
+++ /dev/null
@@ -1,578 +0,0 @@
-<Page
-    x:Class="VDownload.GUI.Views.HomeView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.GUI.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:i="using:Microsoft.Xaml.Interactivity" 
-    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
-    xmlns:cc="using:VDownload.GUI.Controls"
-    xmlns:cmn="using:VDownload.Common"
-    xmlns:ct="using:CommunityToolkit.WinUI"
-    xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
-    xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
-    xmlns:ctb="using:CommunityToolkit.WinUI.Behaviors"
-    mc:Ignorable="d"
-    Background="Transparent"
-    x:Name="Root">
-    <i:Interaction.Behaviors>
-        <ic:EventTriggerBehavior EventName="Loaded">
-            <ic:InvokeCommandAction Command="{Binding NavigationCommand}"/>
-        </ic:EventTriggerBehavior>
-    </i:Interaction.Behaviors>
-    <Grid RowSpacing="10"
-          Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <ctuc:SwitchPresenter Grid.Row="0"
-                              Value="{Binding MainContent, Converter={StaticResource EnumToStringConverter}}"
-                              CornerRadius="10">
-            <ctuc:Case Value="Downloads">
-                <ctuc:SwitchPresenter Value="{Binding TaskListIsEmpty, Converter={StaticResource BooleanToStringConverter}}">
-                    <ctuc:Case Value="True">
-                        <StackPanel HorizontalAlignment="Center"
-                                    VerticalAlignment="Center">
-                            <Image Source="{StaticResource ImageDownloadsNoTasks}"
-                                   Width="100"/>
-                            <TextBlock Text="Click Video/Playlist search button to add new tasks" 
-                                       Foreground="{StaticResource GreyText}"/>
-                        </StackPanel>
-                    </ctuc:Case>
-                    <ctuc:Case Value="False">
-                        <ScrollViewer>
-                            <ItemsControl ItemsSource="{Binding Tasks}">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid Background="{ThemeResource ViewBackgroundColor}"
-                                              CornerRadius="10"
-                                              Height="150">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition/>
-                                                <RowDefinition Height="Auto"/>
-                                            </Grid.RowDefinitions>
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <Image Grid.Column="0" 
-                                                       Source="{Binding Video.ThumbnailUrl}" 
-                                                       VerticalAlignment="Stretch"/>
-                                                <Grid Grid.Column="1"
-                                                      Margin="10"
-                                                      RowSpacing="10">
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="Auto"/>
-                                                        <RowDefinition/>
-                                                    </Grid.RowDefinitions>
-                                                    <Grid Grid.Row="0"
-                                                          ColumnSpacing="10" 
-                                                          HorizontalAlignment="Left">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <TextBlock Grid.Column="0" 
-                                                                   FontWeight="SemiBold"
-                                                                   FontSize="18"
-                                                                   Text="{Binding Video.Title}"
-                                                                   TextTrimming="CharacterEllipsis"/>
-                                                        <TextBlock Grid.Column="1" 
-                                                                   VerticalAlignment="Center"
-                                                                   FontWeight="Light"
-                                                                   FontSize="12"
-                                                                   Text="{Binding Video.Author}"/>
-                                                    </Grid>
-                                                    <Grid Grid.Row="1" 
-                                                          RowSpacing="10" 
-                                                          ColumnSpacing="10">
-                                                        <Grid.Resources>
-                                                            <x:Double x:Key="TextSize">12</x:Double>
-                                                        </Grid.Resources>
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                        </Grid.RowDefinitions>
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto"/>
-                                                            <ColumnDefinition/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <Image Grid.Row="0"
-                                                               Grid.Column="0"
-                                                               Source="{ThemeResource ImageDownloadsQuality}"/>
-                                                        <TextBlock Grid.Row="0"
-                                                                   Grid.Column="1"
-                                                                   FontSize="{StaticResource TextSize}"
-                                                                   VerticalAlignment="Center">
-                                                            <Run Text="{Binding MediaType, Converter={StaticResource EnumToDescriptionConverter}}"/> (<Run Text="{Binding VideoStream.StreamIdentifier}"/>)
-                                                        </TextBlock>
-                                                        <Image Grid.Row="1"
-                                                               Grid.Column="0"
-                                                               Source="{ThemeResource ImageDownloadsTime}"/>
-                                                        <StackPanel Grid.Row="1"
-                                                                    Grid.Column="1"
-                                                                    Orientation="Horizontal"
-                                                                    VerticalAlignment="Center">
-                                                            <TextBlock Text="{Binding DurationAfterTrim}"
-                                                                       FontSize="{StaticResource TextSize}"/>
-                                                            <TextBlock Visibility="{Binding IsTrimmed, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                                                       FontSize="{StaticResource TextSize}">
-                                                                <Run Text=" "/>(<Run Text="{Binding TrimStart}"/> - <Run Text="{Binding TrimEnd}"/>)
-                                                            </TextBlock>
-                                                        </StackPanel>
-                                                        <Image Grid.Row="2"
-                                                               Grid.Column="0"
-                                                               Source="{ThemeResource ImageDownloadsFile}"/>
-                                                        <TextBlock Grid.Row="2"
-                                                                   Grid.Column="1"
-                                                                   FontSize="{StaticResource TextSize}"
-                                                                   VerticalAlignment="Center"
-                                                                   Text="{Binding FilePath}"/>
-                                                        <Image Grid.Row="3"
-                                                               Grid.Column="0">
-                                                            <i:Interaction.Behaviors>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Idle">
-                                                                    <ic:ChangePropertyAction PropertyName="Source"
-                                                                                             Value="{ThemeResource ImageDownloadsIdle}"/>
-                                                                </ic:DataTriggerBehavior>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Queued">
-                                                                    <ic:ChangePropertyAction PropertyName="Source"
-                                                                                             Value="{ThemeResource ImageDownloadsQueued}"/>
-                                                                </ic:DataTriggerBehavior>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Initializing">
-                                                                    <ic:ChangePropertyAction PropertyName="Source"
-                                                                                             Value="{ThemeResource ImageDownloadsInitializing}"/>
-                                                                </ic:DataTriggerBehavior>
-                                                            </i:Interaction.Behaviors>
-                                                        </Image>
-                                                        <TextBlock Grid.Row="3"
-                                                                   Grid.Column="1"
-                                                                   FontSize="{StaticResource TextSize}"
-                                                                   VerticalAlignment="Center">
-                                                            <i:Interaction.Behaviors>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Idle">
-                                                                    <ic:ChangePropertyAction PropertyName="Text"
-                                                                                             Value="Idle"/>
-                                                                </ic:DataTriggerBehavior>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Queued">
-                                                                    <ic:ChangePropertyAction PropertyName="Text"
-                                                                                             Value="Queued"/>
-                                                                </ic:DataTriggerBehavior>
-                                                                <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToStringConverter}}"
-                                                                                        ComparisonCondition="Equal"
-                                                                                        Value="Initializing">
-                                                                    <ic:ChangePropertyAction PropertyName="Text"
-                                                                                             Value="Initializing"/>
-                                                                </ic:DataTriggerBehavior>
-                                                            </i:Interaction.Behaviors>
-                                                        </TextBlock>
-                                                    </Grid>
-                                                </Grid>
-                                                <Grid Grid.Column="2"
-                                                      Margin="0,0,5,0">
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                    </Grid.RowDefinitions>
-                                                    <AppBarButton Grid.Row="0" 
-                                                                  Width="40" 
-                                                                  Height="48">
-                                                        <i:Interaction.Behaviors>
-                                                            <ic:EventTriggerBehavior EventName="Click">
-                                                                <ctb:NavigateToUriAction NavigateUri="{Binding Video.Url}"/>
-                                                            </ic:EventTriggerBehavior>
-                                                            <ic:DataTriggerBehavior Binding="{Binding Video.Source, Converter={StaticResource EnumToStringConverter}}"
-                                                                                    ComparisonCondition="Equal"
-                                                                                    Value="Twitch">
-                                                                <ic:ChangePropertyAction PropertyName="Icon">
-                                                                    <ic:ChangePropertyAction.Value>
-                                                                        <BitmapIcon ShowAsMonochrome="False" 
-                                                                                    UriSource="{StaticResource ImageSourcesTwitch}"/>
-                                                                    </ic:ChangePropertyAction.Value>
-                                                                </ic:ChangePropertyAction>
-                                                            </ic:DataTriggerBehavior>
-                                                        </i:Interaction.Behaviors>
-                                                    </AppBarButton>
-                                                    <AppBarButton Grid.Row="1" 
-                                                                  Width="40" 
-                                                                  Height="48"
-                                                                  Command="{Binding ElementName=Root, Path=DataContext.StartCancelTaskCommand}"
-                                                                  CommandParameter="{Binding}">
-                                                        <i:Interaction.Behaviors>
-                                                            <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                                    ComparisonCondition="LessThan"
-                                                                                    Value="4">
-                                                                <ic:ChangePropertyAction PropertyName="Icon">
-                                                                    <ic:ChangePropertyAction.Value>
-                                                                        <SymbolIcon Symbol="Download"/>
-                                                                    </ic:ChangePropertyAction.Value>
-                                                                </ic:ChangePropertyAction>
-                                                            </ic:DataTriggerBehavior>
-                                                            <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                                    ComparisonCondition="GreaterThanOrEqual"
-                                                                                    Value="4">
-                                                                <ic:ChangePropertyAction PropertyName="Icon">
-                                                                    <ic:ChangePropertyAction.Value>
-                                                                        <SymbolIcon Symbol="Cancel"/>
-                                                                    </ic:ChangePropertyAction.Value>
-                                                                </ic:ChangePropertyAction>
-                                                            </ic:DataTriggerBehavior>
-                                                        </i:Interaction.Behaviors>
-                                                    </AppBarButton>
-                                                    <AppBarButton Grid.Row="2" 
-                                                                  Icon="Delete" 
-                                                                  Width="40" 
-                                                                  Height="48"/>
-                                                </Grid>
-                                            </Grid>
-                                            <ProgressBar Grid.Row="1"
-                                                         Value="{Binding Progress}">
-                                                <i:Interaction.Behaviors>
-                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                        ComparisonCondition="LessThan"
-                                                                        Value="5">
-                                                        <ic:ChangePropertyAction PropertyName="Visibility" Value="Collapsed"/>
-                                                    </ic:DataTriggerBehavior>
-                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                        ComparisonCondition="GreaterThanOrEqual"
-                                                                        Value="5">
-                                                        <ic:ChangePropertyAction PropertyName="Visibility" Value="Visible"/>
-                                                    </ic:DataTriggerBehavior>
-                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                            ComparisonCondition="LessThan"
-                                                                            Value="7">
-                                                        <ic:ChangePropertyAction PropertyName="IsIndeterminate" Value="True"/>
-                                                    </ic:DataTriggerBehavior>
-                                                    <ic:DataTriggerBehavior Binding="{Binding Status, Converter={StaticResource EnumToIntConverter}}"
-                                                                            ComparisonCondition="GreaterThanOrEqual"
-                                                                            Value="7">
-                                                        <ic:ChangePropertyAction PropertyName="IsIndeterminate" Value="False"/>
-                                                    </ic:DataTriggerBehavior>
-                                                </i:Interaction.Behaviors>
-                                            </ProgressBar>
-                                        </Grid>
-                                        
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </ScrollViewer>
-                    </ctuc:Case>
-                </ctuc:SwitchPresenter>
-            </ctuc:Case>
-            <ctuc:Case Value="Video">
-                <Grid Padding="15" 
-                      RowSpacing="20"
-                      Background="{ThemeResource ViewBackgroundColor}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="150"/>
-                        <RowDefinition/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <Grid Grid.Row="0"
-                          ColumnSpacing="10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border Grid.Column="0"
-                                CornerRadius="{ThemeResource ControlCornerRadius}">
-                            <Image Source="{Binding Task.Video.ThumbnailUrl}"
-                                   VerticalAlignment="Stretch"/>
-                        </Border>
-                        <StackPanel Grid.Column="1" 
-                                    Spacing="15">
-                            <TextBlock Text="{Binding Task.Video.Title}"
-                                       FontWeight="Bold"
-                                       FontSize="20"
-                                       TextWrapping="WrapWholeWords"/>
-                            <Grid ColumnSpacing="10"
-                                  RowSpacing="10">
-                                <Grid.Resources>
-                                    <x:Double x:Key="IconSize">18</x:Double>
-                                </Grid.Resources>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.Column="0"
-                                       Grid.Row="0"
-                                       Source="{ThemeResource ImageVideoAuthor}"
-                                       Width="{StaticResource IconSize}"/>
-                                <TextBlock Grid.Column="1"
-                                           Grid.Row="0"
-                                           Text="{Binding Task.Video.Author}"/>
-                                <Image Grid.Column="0"
-                                       Grid.Row="1"
-                                       Source="{ThemeResource ImageVideoDate}"
-                                       Width="{StaticResource IconSize}"/>
-                                <TextBlock Grid.Column="1"
-                                           Grid.Row="1"
-                                           Text="{Binding Task.Video.PublishDate}"/>
-                                <Image Grid.Column="0"
-                                       Grid.Row="2"
-                                       Source="{ThemeResource ImageVideoTime}"
-                                       Width="{StaticResource IconSize}"/>
-                                <TextBlock Grid.Column="1"
-                                           Grid.Row="2"
-                                           Text="{Binding Task.Video.Duration}"/>
-                                <Image Grid.Column="0"
-                                       Grid.Row="3"
-                                       Source="{ThemeResource ImageVideoView}"
-                                       Width="{StaticResource IconSize}"/>
-                                <TextBlock Grid.Column="1"
-                                           Grid.Row="3"
-                                           Text="{Binding Task.Video.ViewCount}"/>
-                            </Grid>
-                        </StackPanel>
-                    </Grid>
-                    <ScrollViewer Grid.Row="1">
-                        <StackPanel Spacing="20">
-                            <StackPanel Spacing="5">
-                                <TextBlock Text="Media options"
-                                           FontWeight="Bold"
-                                           FontSize="15"/>
-                                <ctc:SettingsCard Header="Quality">
-                                    <ctc:SettingsCard.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" 
-                                                    UriSource="{ThemeResource ImageVideoQuality}"/>
-                                    </ctc:SettingsCard.HeaderIcon>
-                                    <ComboBox ItemsSource="{Binding Task.Video.Streams}"
-                                              SelectedItem="{Binding Task.VideoStream, Mode=TwoWay}">
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <TextBlock Text="{Binding StreamIdentifier}"/>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
-                                </ctc:SettingsCard>
-                                <ctc:SettingsCard Header="Media type">
-                                    <ctc:SettingsCard.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" 
-                                                    UriSource="{ThemeResource ImageVideoMedia}"/>
-                                    </ctc:SettingsCard.HeaderIcon>
-                                    <ComboBox ItemsSource="{ct:EnumValues Type=cmn:MediaType}"
-                                              SelectedItem="{Binding Task.MediaType, Mode=TwoWay}">
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"/>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
-                                </ctc:SettingsCard>
-                                <ctc:SettingsExpander Header="Trim">
-                                    <ctc:SettingsExpander.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" 
-                                                    UriSource="{ThemeResource ImageVideoTrim}"/>
-                                    </ctc:SettingsExpander.HeaderIcon>
-                                    <ctc:SettingsExpander.Items>
-                                        <ctc:SettingsCard Header="Start at">
-                                            <cc:TimeSpanControl Value="{Binding Task.TrimStart, Mode=TwoWay}" 
-                                                                Maximum="{Binding Task.TrimEnd, Mode=OneWay}"/>
-                                        </ctc:SettingsCard>
-                                        <ctc:SettingsCard Header="End at">
-                                            <cc:TimeSpanControl Minimum="{Binding Task.TrimStart, Mode=OneWay}" 
-                                                                Value="{Binding Task.TrimEnd, Mode=TwoWay}" 
-                                                                Maximum="{Binding Task.Video.Duration, Mode=OneWay}"/>
-                                        </ctc:SettingsCard>
-                                    </ctc:SettingsExpander.Items>
-                                </ctc:SettingsExpander>
-                            </StackPanel>
-                            <StackPanel Spacing="5">
-                                <TextBlock Text="File options"
-                                           FontWeight="Bold"
-                                           FontSize="15"/>
-                                <ctc:SettingsCard Header="Directory"
-                                                  Description="{Binding Task.DirectoryPath}">
-                                    <ctc:SettingsCard.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" UriSource="{ThemeResource ImageVideoDirectory}"/>
-                                    </ctc:SettingsCard.HeaderIcon>
-                                    <Button Content="Browse" 
-                                            Command="{Binding BrowseCommand}"/>
-                                </ctc:SettingsCard>
-                                <ctc:SettingsCard Header="Filename">
-                                    <ctc:SettingsCard.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" UriSource="{ThemeResource ImageVideoFilename}"/>
-                                    </ctc:SettingsCard.HeaderIcon>
-                                    <TextBox Text="{Binding Task.Filename, Mode=TwoWay}"/>
-                                </ctc:SettingsCard>
-                                <ctc:SettingsCard Header="File type"
-                                                  Description="If original video is not in selected type, it will be converted">
-                                    <ctc:SettingsCard.HeaderIcon>
-                                        <BitmapIcon ShowAsMonochrome="False" UriSource="{ThemeResource ImageVideoExtension}"/>
-                                    </ctc:SettingsCard.HeaderIcon>
-                                    <ComboBox>
-                                        <i:Interaction.Behaviors>
-                                            <ic:DataTriggerBehavior Binding="{Binding Task.MediaType, Converter={StaticResource EnumToStringConverter}}"
-                                                                    ComparisonCondition="Equal"
-                                                                    Value="OnlyAudio">
-                                                <ic:ChangePropertyAction PropertyName="ItemsSource"
-                                                                         Value="{ct:EnumValues Type=cmn:AudioExtension}"/>
-                                                <ic:ChangePropertyAction PropertyName="SelectedItem"
-                                                                         Value="{Binding Task.AudioExtension}"/>
-                                            </ic:DataTriggerBehavior>
-                                            <ic:DataTriggerBehavior Binding="{Binding Task.MediaType, Converter={StaticResource EnumToStringConverter}}"
-                                                                    ComparisonCondition="NotEqual"
-                                                                    Value="OnlyAudio">
-                                                <ic:ChangePropertyAction PropertyName="ItemsSource"
-                                                                         Value="{ct:EnumValues Type=cmn:VideoExtension}"/>
-                                                <ic:ChangePropertyAction PropertyName="SelectedItem"
-                                                                         Value="{Binding Task.VideoExtension}"/>
-                                            </ic:DataTriggerBehavior>
-                                        </i:Interaction.Behaviors>
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <TextBlock Text="{Binding}"/>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
-                                </ctc:SettingsCard>
-                            </StackPanel>
-                        </StackPanel>
-                    </ScrollViewer>
-                    <Button Grid.Row="2" 
-                            HorizontalAlignment="Right" 
-                            Style="{StaticResource AccentButtonStyle}"
-                            Content="Create download task"  
-                            Command="{Binding CreateTaskCommand}"/>
-                </Grid>
-            </ctuc:Case>
-        </ctuc:SwitchPresenter>
-        <Grid Grid.Row="1"
-              Background="{ThemeResource OptionBarBackgroundColor}"
-              CornerRadius="10">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="50"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <ctuc:UniformGrid Grid.Column="0" 
-                              Rows="1" 
-                              Margin="15,0,0,0">
-                <ctuc:UniformGrid.RowDefinitions>
-                    <RowDefinition/>
-                </ctuc:UniformGrid.RowDefinitions>
-                <ctuc:UniformGrid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="Auto"/>
-                </ctuc:UniformGrid.ColumnDefinitions>
-                <ctuc:SwitchPresenter Grid.Row="0" 
-                                      VerticalAlignment="Stretch" 
-                                      Margin="0,0,15,0" 
-                                      Value="{Binding OptionBarContent, Converter={StaticResource EnumToStringConverter}}">
-                    <i:Interaction.Behaviors>
-                        <ic:DataTriggerBehavior Binding="{Binding OptionBarContent, Converter={StaticResource EnumToStringConverter}}"
-                                                ComparisonCondition="Equal"
-                                                Value="None">
-                            <ic:ChangePropertyAction PropertyName="Visibility"
-                                                     Value="Collapsed"/>
-                        </ic:DataTriggerBehavior>
-                        <ic:DataTriggerBehavior Binding="{Binding OptionBarContent, Converter={StaticResource EnumToStringConverter}}"
-                                                ComparisonCondition="NotEqual"
-                                                Value="None">
-                            <ic:ChangePropertyAction PropertyName="Visibility"
-                                                     Value="Visible"/>
-                        </ic:DataTriggerBehavior>
-                    </i:Interaction.Behaviors>
-                    <ctuc:Case Value="VideoSearch">
-                        <Grid ColumnSpacing="10" 
-                              VerticalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" 
-                                     PlaceholderText="Video URL"
-                                     VerticalAlignment="Center"
-                                     Text="{Binding OptionBarVideoSearchTBValue, Mode=TwoWay}"/>
-                            <Button Grid.Column="1" 
-                                    Content="Search"
-                                    IsEnabled="{Binding OptionBarSearchNotPending}"
-                                    Command="{Binding VideoSearchStartCommand}"/>
-                        </Grid>
-                    </ctuc:Case>
-                    <ctuc:Case Value="PlaylistSearch">
-                        <Grid ColumnSpacing="10">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" 
-                                     VerticalAlignment="Center"
-                                     PlaceholderText="Playlist URL"
-                                     Text="{Binding OptionBarPlaylistSearchTBValue, Mode=TwoWay}"/>
-                            <NumberBox Grid.Column="1" 
-                                       VerticalAlignment="Center"
-                                       SpinButtonPlacementMode="Compact" 
-                                       SmallChange="1" 
-                                       LargeChange="10" 
-                                       Value="{Binding OptionBarPlaylistSearchNBValue, Mode=TwoWay}"
-                                       Minimum="1"
-                                       ToolTipService.ToolTip="Number of videos to get from playlist"/>
-                            <Button Grid.Column="2" 
-                                    Content="Search"
-                                    IsEnabled="{Binding OptionBarSearchNotPending}"
-                                    Command="{Binding PlaylistSearchStartCommand}"/>
-                        </Grid>
-                    </ctuc:Case>
-                </ctuc:SwitchPresenter>
-                <StackPanel VerticalAlignment="Center" 
-                            Orientation="Horizontal">
-                    <ProgressRing Width="20" 
-                          Height="20" 
-                          Margin="0,0,10,0"
-                          Visibility="{Binding OptionBarLoading, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                    <TextBlock Text="{Binding OptionBarMessage}"/>
-                </StackPanel>
-            </ctuc:UniformGrid>
-            <StackPanel Grid.Column="2" 
-                        Orientation="Horizontal">
-                <AppBarButton Width="150"
-                              Label="Load from subscriptions"
-                              Icon="Favorite"
-                              IsEnabled="{Binding OptionBarSearchNotPending}"
-                              Command="{Binding LoadFromSubscriptionCommand}"/>
-                <AppBarToggleButton Label="Video search"
-                                    Width="100"
-                                    Icon="Video"
-                                    IsEnabled="{Binding OptionBarSearchNotPending}"
-                                    IsChecked="{Binding OptionBarVideoSearchButtonChecked, Mode=TwoWay}"
-                                    Command="{Binding VideoSearchShowCommand}"/>
-                <AppBarToggleButton Label="Playlist search"
-                                    Width="100"
-                                    Icon="List"
-                                    IsEnabled="{Binding OptionBarSearchNotPending}"
-                                    IsChecked="{Binding OptionBarPlaylistSearchButtonChecked, Mode=TwoWay}"
-                                    Command="{Binding PlaylistSearchShowCommand}"/>
-                <AppBarSeparator/>
-                <AppBarButton Width="100"
-                              Label="Download all"
-                              Icon="Download"
-                              Command="{Binding DownloadCommand}"/>
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/VDownload.GUI/VDownload.GUI.Views/VDownload.GUI.Views.csproj b/VDownload.GUI/VDownload.GUI.Views/VDownload.GUI.Views.csproj
deleted file mode 100644
index b119c01..0000000
--- a/VDownload.GUI/VDownload.GUI.Views/VDownload.GUI.Views.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Views</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="AuthenticationView.xaml" />
-    <None Remove="HomeView.xaml" />
-    <None Remove="SettingsView.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-      <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.240109" />
-      <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-      <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
-      <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-      <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\VDownload.GUI.Controls\VDownload.GUI.Controls.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.Customs\VDownload.GUI.Customs.csproj" />
-    <ProjectReference Include="..\VDownload.GUI.ViewModels\VDownload.GUI.ViewModels.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="AuthenticationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="SettingsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-</Project>
diff --git a/VDownload.Common/AudioExtension.cs b/VDownload.Models/AudioExtension.cs
similarity index 67%
rename from VDownload.Common/AudioExtension.cs
rename to VDownload.Models/AudioExtension.cs
index f0ef465..e66e4e1 100644
--- a/VDownload.Common/AudioExtension.cs
+++ b/VDownload.Models/AudioExtension.cs
@@ -4,10 +4,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common
+namespace VDownload.Models
 {
     public enum AudioExtension
     {
-        MP3
+        MP3,
+        FLAC,
+        WAV,
+        OGG
     }
 }
diff --git a/VDownload.Common/MediaType.cs b/VDownload.Models/MediaType.cs
similarity index 92%
rename from VDownload.Common/MediaType.cs
rename to VDownload.Models/MediaType.cs
index 48c6a6f..89fd094 100644
--- a/VDownload.Common/MediaType.cs
+++ b/VDownload.Models/MediaType.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common
+namespace VDownload.Models
 {
     public enum MediaType
     {
diff --git a/VDownload.Common/VideoExtension.cs b/VDownload.Models/Playlist.cs
similarity index 66%
rename from VDownload.Common/VideoExtension.cs
rename to VDownload.Models/Playlist.cs
index 57f9816..c9ffadd 100644
--- a/VDownload.Common/VideoExtension.cs
+++ b/VDownload.Models/Playlist.cs
@@ -4,10 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common
+namespace VDownload.Models
 {
-    public enum VideoExtension
+    public abstract class Playlist
     {
-        MP4
     }
 }
diff --git a/VDownload.Models/ProcessingSpeed.cs b/VDownload.Models/ProcessingSpeed.cs
new file mode 100644
index 0000000..a0c8b36
--- /dev/null
+++ b/VDownload.Models/ProcessingSpeed.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public enum ProcessingSpeed
+    {
+        VerySlow = 0,
+        Slower = 1,
+        Slow = 2,
+        Medium = 3,
+        Fast = 4,
+        Faster = 5,
+        VeryFast = 6,
+        SuperFast = 7,
+        UltraFast = 8
+    }
+}
diff --git a/VDownload.Common/Source.cs b/VDownload.Models/Source.cs
similarity index 86%
rename from VDownload.Common/Source.cs
rename to VDownload.Models/Source.cs
index 30e549b..4bc4528 100644
--- a/VDownload.Common/Source.cs
+++ b/VDownload.Models/Source.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common
+namespace VDownload.Models
 {
     public enum Source
     {
diff --git a/VDownload.Extensions/VDownload.Extensions.csproj b/VDownload.Models/VDownload.Models.csproj
similarity index 100%
rename from VDownload.Extensions/VDownload.Extensions.csproj
rename to VDownload.Models/VDownload.Models.csproj
diff --git a/VDownload.Models/Video.cs b/VDownload.Models/Video.cs
new file mode 100644
index 0000000..03d2612
--- /dev/null
+++ b/VDownload.Models/Video.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public abstract class Video
+    {
+        #region PROPERTIES
+
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string Author { get; set; }
+        public DateTime PublishDate { get; set; }
+        public TimeSpan Duration { get; set; }
+        public long Views { get; set; }
+        public Uri ThumbnailUrl { get; set; }
+        public ICollection<VideoStream> Streams { get; set; }
+        public Uri Url { get; set; }
+        public Source Source { get; set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        protected Video() 
+        {
+            Streams = new List<VideoStream>();
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Models/VideoDownloadOptions.cs b/VDownload.Models/VideoDownloadOptions.cs
new file mode 100644
index 0000000..7786323
--- /dev/null
+++ b/VDownload.Models/VideoDownloadOptions.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public class VideoDownloadOptions
+    {
+        #region FIELDS
+
+        private readonly TimeSpan _originalDuration;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public required VideoStream SelectedStream { get; set; }
+        public required TimeSpan TrimStart { get; set; }
+        public required TimeSpan TrimEnd { get; set; }
+        public required MediaType MediaType { get; set; }
+        public required string Directory { get; set; }
+        public required string Filename { get; set; }
+        public required string Extension { get; set; }
+        public TimeSpan DurationAfterTrim => TrimEnd - TrimStart;
+        public bool IsTrimmed => _originalDuration != DurationAfterTrim;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public VideoDownloadOptions(TimeSpan originalDuration)
+        {
+            _originalDuration = originalDuration;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Models/VideoExtension.cs b/VDownload.Models/VideoExtension.cs
new file mode 100644
index 0000000..2d49ad8
--- /dev/null
+++ b/VDownload.Models/VideoExtension.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public enum VideoExtension
+    {
+        MP4,
+        MKV,
+        AVI,
+        MOV,
+        WEBM,
+        WMV,
+    }
+}
diff --git a/VDownload.Models/VideoStream.cs b/VDownload.Models/VideoStream.cs
new file mode 100644
index 0000000..a30fe59
--- /dev/null
+++ b/VDownload.Models/VideoStream.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public abstract class VideoStream
+    {
+        #region PROPERTIES
+
+        public string Name { get; set; }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public override string ToString() => Name;
+
+        public abstract Task<VideoStreamDownloadResult> Download(string taskTemporaryDirectory, IProgress<double> onProgress, CancellationToken token, TimeSpan trimStart, TimeSpan trimEnd);
+
+        #endregion
+    }
+}
diff --git a/VDownload.Models/VideoStreamDownloadResult.cs b/VDownload.Models/VideoStreamDownloadResult.cs
new file mode 100644
index 0000000..c804349
--- /dev/null
+++ b/VDownload.Models/VideoStreamDownloadResult.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public struct VideoStreamDownloadResult
+    {
+        #region PROPERTIES
+
+        public required string File { get; init; }
+        public required TimeSpan NewTrimStart { get; init; }
+        public required TimeSpan NewTrimEnd { get; init; }
+        public required TimeSpan NewDuration { get; init; }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Authentication/AuthenticationConfiguration.cs b/VDownload.Services/VDownload.Services.Authentication/AuthenticationConfiguration.cs
deleted file mode 100644
index 6edc12a..0000000
--- a/VDownload.Services/VDownload.Services.Authentication/AuthenticationConfiguration.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Services.Authentication
-{
-    public class AuthenticationConfiguration
-    {
-        #region PROPERTIES
-
-        public string FilePath { get; private set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public AuthenticationConfiguration(IConfiguration configuration)
-        {
-            IConfigurationSection section = configuration.GetSection("authentication");
-            FilePath = section["file_path"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Services/VDownload.Services.Authentication/AuthenticationData.cs b/VDownload.Services/VDownload.Services.Authentication/AuthenticationData.cs
deleted file mode 100644
index 37ed731..0000000
--- a/VDownload.Services/VDownload.Services.Authentication/AuthenticationData.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Services.Authentication
-{
-    public class AuthenticationData
-    {
-        #region PROPERTY
-
-        [JsonProperty("twitch")]
-        public AuthenticationDataTwitch Twitch { get; internal set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public AuthenticationData() 
-        {
-            Twitch = new AuthenticationDataTwitch();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Services/VDownload.Services.Authentication/AuthenticationService.cs b/VDownload.Services/VDownload.Services.Authentication/AuthenticationService.cs
deleted file mode 100644
index 6f74693..0000000
--- a/VDownload.Services/VDownload.Services.Authentication/AuthenticationService.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Extensions;
-
-namespace VDownload.Services.Authentication
-{
-    public interface IAuthenticationService
-    {
-        #region PROPERTIES
-
-        AuthenticationData? AuthenticationData { get; }
-
-        #endregion
-
-
-
-        #region METHODS
-
-        Task Load();
-        Task Save();
-
-        #endregion
-    }
-
-
-
-    public class AuthenticationService : IAuthenticationService
-    {
-        #region SERVICES
-
-        private AuthenticationConfiguration _configuration;
-
-        #endregion
-
-
-
-        #region FIELDS
-
-        private string _authenticationDataFile;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        public AuthenticationData AuthenticationData { get; private set; }
-
-        public bool AuthenticationDataLoaded => AuthenticationData is not null;
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public AuthenticationService(AuthenticationConfiguration configuration)
-        {
-            _configuration = configuration;
-
-            _authenticationDataFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _configuration.FilePath);
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        public async Task Load()
-        {
-            AuthenticationData = null;
-
-            if (File.Exists(_authenticationDataFile))
-            {
-                string content = await File.ReadAllTextAsync(_authenticationDataFile);
-                AuthenticationData = JsonConvert.DeserializeObject<AuthenticationData>(content);
-            }
-
-            AuthenticationData ??= new AuthenticationData();
-        }
-
-        public async Task Save()
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(_authenticationDataFile));
-            string content = JsonConvert.SerializeObject(AuthenticationData);
-            await File.WriteAllTextAsync(_authenticationDataFile, content);
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationData.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationData.cs
new file mode 100644
index 0000000..f036d91
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationData.cs
@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using VDownload.Services.Data.Authentication.Models;
+
+namespace VDownload.Services.Data.Authentication
+{
+    public class AuthenticationData
+    {
+        #region PROPERTIES
+
+        [JsonProperty("twitch")]
+        public TokenAuthenticationData Twitch { get; set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public AuthenticationData()
+        {
+            Twitch = new TokenAuthenticationData();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationDataService.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationDataService.cs
new file mode 100644
index 0000000..80a0840
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/AuthenticationDataService.cs
@@ -0,0 +1,95 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Services.Data.Configuration;
+
+namespace VDownload.Services.Data.Authentication
+{
+    public interface IAuthenticationDataService
+    {
+        #region PROPERTIES
+
+        AuthenticationData Data { get; }
+
+        #endregion
+
+
+
+        #region METHODS
+
+        Task Load();
+        Task Save();
+
+        #endregion
+    }
+
+    public class AuthenticationDataService : IAuthenticationDataService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected readonly string _filePath;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public AuthenticationData Data { get; protected set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public AuthenticationDataService(IConfigurationService configurationService)
+        {
+            _configurationService = configurationService;
+
+            string appdataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string appdataDirectoryName = _configurationService.Common.Path.Appdata.DirectoryName;
+            string appdataAuthenticationFilename = _configurationService.Common.Path.Appdata.AuthenticationFile;
+            _filePath = Path.Combine(appdataPath, appdataDirectoryName, appdataAuthenticationFilename);
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public async Task Load()
+        {
+            Data = null;
+
+            if (File.Exists(_filePath))
+            {
+                string content = await File.ReadAllTextAsync(_filePath);
+                Data = JsonConvert.DeserializeObject<AuthenticationData>(content);
+            }
+
+            Data ??= new AuthenticationData();
+        }
+
+        public async Task Save()
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(_filePath));
+            string content = JsonConvert.SerializeObject(Data);
+            await File.WriteAllTextAsync(_filePath, content);
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Authentication/AuthenticationDataTwitch.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/Models/TokenAuthenticationData.cs
similarity index 70%
rename from VDownload.Services/VDownload.Services.Authentication/AuthenticationDataTwitch.cs
rename to VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/Models/TokenAuthenticationData.cs
index 6199d72..00189d5 100644
--- a/VDownload.Services/VDownload.Services.Authentication/AuthenticationDataTwitch.cs
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/Models/TokenAuthenticationData.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Services.Authentication
+namespace VDownload.Services.Data.Authentication.Models
 {
-    public class AuthenticationDataTwitch
+    public class TokenAuthenticationData
     {
         [JsonProperty("token")]
         public byte[]? Token { get; set; }
diff --git a/VDownload.Services/VDownload.Services.Authentication/VDownload.Services.Authentication.csproj b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/VDownload.Services.Data.Authentication.csproj
similarity index 64%
rename from VDownload.Services/VDownload.Services.Authentication/VDownload.Services.Authentication.csproj
rename to VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/VDownload.Services.Data.Authentication.csproj
index 9fb2221..8b38c4b 100644
--- a/VDownload.Services/VDownload.Services.Authentication/VDownload.Services.Authentication.csproj
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Authentication/VDownload.Services.Data.Authentication.csproj
@@ -7,12 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\VDownload.Extensions\VDownload.Extensions.csproj" />
+    <ProjectReference Include="..\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/CommonConfiguration.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/CommonConfiguration.cs
new file mode 100644
index 0000000..16296f3
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/CommonConfiguration.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Configuration;
+using System.Text.Json.Serialization;
+using VDownload.Services.Data.Configuration.Models;
+
+namespace VDownload.Services.Data.Configuration
+{
+    public class CommonConfiguration
+    {
+        [ConfigurationKeyName("path")]
+        public Models.Path Path { get; set; }
+
+        [ConfigurationKeyName("processing")]
+        public Processing Processing { get; set; }
+
+        [ConfigurationKeyName("string_resources_assembly")]
+        public string StringResourcesAssembly { get; set; }
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/ConfigurationService.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/ConfigurationService.cs
new file mode 100644
index 0000000..91a411c
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/ConfigurationService.cs
@@ -0,0 +1,48 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Sources.Twitch.Configuration;
+
+namespace VDownload.Services.Data.Configuration
+{
+    public interface IConfigurationService
+    {
+        CommonConfiguration Common { get; }
+        TwitchConfiguration Twitch { get; }
+    }
+
+
+
+    public class ConfigurationService : IConfigurationService
+    {
+        #region SERVICES
+
+        protected readonly IConfiguration _configuration;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public CommonConfiguration Common { get; protected set; }
+        public TwitchConfiguration Twitch { get; protected set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public ConfigurationService(IConfiguration configuration)
+        {
+            Common = configuration.GetSection("common").Get<CommonConfiguration>()!;
+            Twitch = configuration.GetSection("twitch").Get<TwitchConfiguration>()!;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs
new file mode 100644
index 0000000..36d6340
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Configuration.Models
+{
+    public class Appdata
+    {
+        [ConfigurationKeyName("directory_name")]
+        public string DirectoryName { get; set; }
+
+        [ConfigurationKeyName("authentication_file")]
+        public string AuthenticationFile { get; set; }
+
+        [ConfigurationKeyName("settings_file")]
+        public string SettingsFile { get; set; }
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Muxer.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Muxer.cs
new file mode 100644
index 0000000..ac6a047
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Muxer.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Configuration.Models
+{
+    public class Muxer
+    {
+        [ConfigurationKeyName("extension")]
+        public string Extension { get; set; }
+
+        [ConfigurationKeyName("video_codecs")]
+        public List<string> VideoCodecs { get; } = new List<string>();
+
+        [ConfigurationKeyName("audio_codecs")]
+        public List<string> AudioCodecs { get; } = new List<string>();
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Path.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Path.cs
new file mode 100644
index 0000000..acf168a
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Path.cs
@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Configuration.Models
+{
+    public class Path
+    {
+        [ConfigurationKeyName("appdata")]
+        public Appdata Appdata { get; set; }
+
+        [ConfigurationKeyName("temp")]
+        public Temp Temp { get; set; }
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Processing.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Processing.cs
new file mode 100644
index 0000000..848d2f0
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Processing.cs
@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Configuration.Models
+{
+    public class Processing
+    {
+        [ConfigurationKeyName("muxers")]
+        public List<Muxer> Muxers { get; } = new List<Muxer>();
+
+        [ConfigurationKeyName("processed_filename")]
+        public string ProcessedFilename { get; set; }
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Temp.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Temp.cs
new file mode 100644
index 0000000..f1fa8fa
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Temp.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Configuration.Models
+{
+    public class Temp
+    {
+        [ConfigurationKeyName("tasks_directory")]
+        public string TasksDirectory { get; set; }
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/VDownload.Services.Data.Configuration.csproj b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/VDownload.Services.Data.Configuration.csproj
new file mode 100644
index 0000000..92db40e
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/VDownload.Services.Data.Configuration.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Configuration\VDownload.Sources.Twitch.Configuration.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/CommonSettings.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/CommonSettings.cs
new file mode 100644
index 0000000..5802add
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/CommonSettings.cs
@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Settings.Models;
+
+namespace VDownload.Services.Data.Settings
+{
+    public class CommonSettings
+    {
+        [JsonProperty("max_number_of_videos_to_get_from_playlist")]
+        public int MaxNumberOfVideosToGetFromPlaylist { get; set; } = 0;
+
+        [JsonProperty("max_number_of_running_tasks")]
+        public int MaxNumberOfRunningTasks { get; set; } = 5;
+
+        [JsonProperty("temp_directory")]
+        public string TempDirectory { get; set; } = $"{Path.GetTempPath()}\\VDownload";
+
+        [JsonProperty("delete_temp_on_error")]
+        public bool DeleteTempOnError { get; set; } = true;
+
+        [JsonProperty("default_task_settings")]
+        public DefaultTaskSettings DefaultTaskSettings { get; set; } = new DefaultTaskSettings();
+
+        [JsonProperty("notifications")]
+        public Notifications Notifications { get; set; } = new Notifications();
+
+        [JsonProperty("processing")]
+        public Processing Processing { get; set; } = new Processing();
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/DefaultTaskSettings.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/DefaultTaskSettings.cs
new file mode 100644
index 0000000..a3617bb
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/DefaultTaskSettings.cs
@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+
+namespace VDownload.Services.Data.Settings.Models
+{
+    public class DefaultTaskSettings
+    {
+        [JsonProperty("media_type")]
+        public MediaType MediaType { get; set; } = MediaType.Original;
+
+        [JsonProperty("video_extension")]
+        public VideoExtension VideoExtension { get; set; } = VideoExtension.MP4;
+
+        [JsonProperty("audio_extension")]
+        public AudioExtension AudioExtension { get; set; } = AudioExtension.MP3;
+
+        [JsonProperty("output_directory")]
+        public string OutputDirectory { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+
+        [JsonProperty("save_last_output_directory")]
+        public bool SaveLastOutputDirectory { get; set; } = false;
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Notifications.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Notifications.cs
new file mode 100644
index 0000000..e9f3c0b
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Notifications.cs
@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Settings.Models
+{
+    public class Notifications
+    {
+        [JsonProperty("on_successful")]
+        public bool OnSuccessful { get; set; } = true;
+
+        [JsonProperty("on_unsuccessful")]
+        public bool OnUnsuccessful { get; set; } = true;
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Processing.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Processing.cs
new file mode 100644
index 0000000..ecee50b
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Processing.cs
@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+
+namespace VDownload.Services.Data.Settings.Models
+{
+    public class Processing
+    {
+        [JsonProperty("ffmpeg_location")]
+        public string FFmpegLocation { get; set; } = $"{AppDomain.CurrentDomain.BaseDirectory}\\FFmpeg";
+
+        [JsonProperty("use_multithreading")]
+        public bool UseMultithreading { get; set; } = true;
+
+        [JsonProperty("use_hardware_acceleration")]
+        public bool UseHardwareAcceleration { get; set; } = true;
+
+        [JsonProperty("speed")]
+        public ProcessingSpeed Speed { get; set; } = ProcessingSpeed.UltraFast;
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsData.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsData.cs
new file mode 100644
index 0000000..c83f011
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsData.cs
@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+using VDownload.Sources.Twitch.Settings;
+
+namespace VDownload.Services.Data.Settings
+{
+    public class SettingsData
+    {
+        #region PROPERTIES
+
+        [JsonProperty("common")]
+        public CommonSettings Common { get; set; }
+
+        [JsonProperty("twitch")]
+        public TwitchSettings Twitch { get; set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        internal SettingsData() 
+        {
+            Common = new CommonSettings();
+            Twitch = new TwitchSettings();
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsService.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsService.cs
new file mode 100644
index 0000000..c4817d4
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/SettingsService.cs
@@ -0,0 +1,104 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Services.Data.Configuration;
+
+namespace VDownload.Services.Data.Settings
+{
+    public interface ISettingsService
+    {
+        #region PROPERTIES
+
+        SettingsData Data { get; }
+
+        #endregion
+
+
+
+        #region METHODS
+
+        Task Load();
+        Task Save();
+        Task Restore();
+
+        #endregion
+    }
+
+
+
+    public class SettingsService : ISettingsService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected readonly string _filePath;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public SettingsData Data { get; private set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public SettingsService(IConfigurationService configurationService)
+        {
+            _configurationService = configurationService;
+
+            string appdataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string appdataDirectoryName = _configurationService.Common.Path.Appdata.DirectoryName;
+            string appdataAuthenticationFilename = _configurationService.Common.Path.Appdata.SettingsFile;
+            _filePath = Path.Combine(appdataPath, appdataDirectoryName, appdataAuthenticationFilename);
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public async Task Load()
+        {
+            Data = null;
+
+            if (File.Exists(_filePath))
+            {
+                string content = await File.ReadAllTextAsync(_filePath);
+                Data = JsonConvert.DeserializeObject<SettingsData>(content);
+            }
+
+            Data ??= new SettingsData();
+        }
+
+        public async Task Save()
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(_filePath));
+            string content = JsonConvert.SerializeObject(Data);
+            await File.WriteAllTextAsync(_filePath, content);
+        }
+
+        public async Task Restore()
+        {
+            Data = new SettingsData();
+            await Save();
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/VDownload.Services.Data.Settings.csproj b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/VDownload.Services.Data.Settings.csproj
new file mode 100644
index 0000000..12f9356
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/VDownload.Services.Data.Settings.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\VDownload.Models\VDownload.Models.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Settings\VDownload.Sources.Twitch.Settings.csproj" />
+    <ProjectReference Include="..\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.Services/VDownload.Services.Search/VDownload.Services.Search.csproj b/VDownload.Services/VDownload.Services.Search/VDownload.Services.Search.csproj
deleted file mode 100644
index 5fbebd8..0000000
--- a/VDownload.Services/VDownload.Services.Search/VDownload.Services.Search.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\VDownload.Common\VDownload.Common.csproj" />
-    <ProjectReference Include="..\..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Search\VDownload.Sources.Twitch.Search.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/VDownload.Services/VDownload.Services.Tasks/TasksService.cs b/VDownload.Services/VDownload.Services.Tasks/TasksService.cs
deleted file mode 100644
index 6c815a4..0000000
--- a/VDownload.Services/VDownload.Services.Tasks/TasksService.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common;
-
-namespace VDownload.Services.Tasks
-{ 
-    public interface ITasksService
-    {
-        #region PROPERTIES
-
-        ObservableCollection<DownloadTask> Tasks { get; }
-
-        #endregion
-
-
-
-        #region METHODS
-
-        void AddTask(DownloadTask task);
-
-        #endregion
-    }
-
-
-
-    public class TasksService : ITasksService
-    {
-        #region FIELDS
-
-        private readonly Task _taskMonitor;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        public ObservableCollection<DownloadTask> Tasks { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public TasksService()
-        {
-            Tasks = new ObservableCollection<DownloadTask>();
-
-            _taskMonitor = Task.Run(TaskMonitor);
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        public void AddTask(DownloadTask task)
-        {
-            Tasks.Add(task);
-        }
-
-        #endregion
-
-
-
-        #region PRIVATE METHODS
-
-        private void TaskMonitor()
-        {
-            int maxTaskNumber = 5; //TODO: from settings
-            DownloadTaskStatus[] pendingStatuses =
-            [
-                DownloadTaskStatus.Initializing,
-                DownloadTaskStatus.Downloading,
-                DownloadTaskStatus.Processing,
-                DownloadTaskStatus.Finalizing
-            ];
-            while (true)
-            {
-                IEnumerable<DownloadTask> pendingTasks = Tasks.Where(x => pendingStatuses.Contains(x.Status));
-                int freeSlots = maxTaskNumber - pendingTasks.Count();
-                if (freeSlots > 0)
-                {
-                    IEnumerable<DownloadTask> queuedTasks = Tasks.Where(x => x.Status == DownloadTaskStatus.Queued).OrderBy(x => x.CreateDate).Take(freeSlots);
-                    foreach (DownloadTask queuedTask in queuedTasks)
-                    {
-                        queuedTask.Start();
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResult.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResult.cs
similarity index 84%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResult.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResult.cs
index 94dc215..802765f 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResult.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResult.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.Dialog
+namespace VDownload.Services.UI.Dialogs
 {
     public enum DialogResult
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultOkCancel.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultOkCancel.cs
similarity index 83%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultOkCancel.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultOkCancel.cs
index 9448db7..2946af6 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultOkCancel.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultOkCancel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.Dialog
+namespace VDownload.Services.UI.Dialogs
 {
     public enum DialogResultOkCancel
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNo.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNo.cs
similarity index 82%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNo.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNo.cs
index 5d47f17..6b5317d 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNo.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNo.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.Dialog
+namespace VDownload.Services.UI.Dialogs
 {
     public enum DialogResultYesNo
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNoCancel.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNoCancel.cs
similarity index 84%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNoCancel.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNoCancel.cs
index c87fa29..8c7fde1 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogResultYesNoCancel.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogResultYesNoCancel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.Dialog
+namespace VDownload.Services.UI.Dialogs
 {
     public enum DialogResultYesNoCancel
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs
similarity index 97%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogService.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs
index 6e1e9cb..dec87ff 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/DialogService.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs
@@ -7,9 +7,9 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.Dialog
+namespace VDownload.Services.UI.Dialogs
 {
-    public interface IDialogService
+    public interface IDialogsService
     {
         #region PROPERTIES
 
@@ -35,7 +35,7 @@ namespace VDownload.GUI.Services.Dialog
 
 
 
-    public class DialogService : IDialogService
+    public class DialogsService : IDialogsService
     {
         #region PROPERTIES
 
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/VDownload.GUI.Services.ResourceDictionaries.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
similarity index 79%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/VDownload.GUI.Services.ResourceDictionaries.csproj
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
index 98bc762..7546d76 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.ResourceDictionaries/VDownload.GUI.Services.ResourceDictionaries.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
@@ -2,14 +2,14 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Services.ResourceDictionaries</RootNamespace>
+    <RootNamespace>VDownload.Services.UI.Dialogs</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
+	  <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 </Project>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/DictionaryResourcesService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/DictionaryResourcesService.cs
new file mode 100644
index 0000000..5c97eef
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/DictionaryResourcesService.cs
@@ -0,0 +1,41 @@
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.UI.DictionaryResources
+{
+    public interface IDictionaryResourcesService
+    {
+        T Get<T>(string key);
+    }
+
+
+
+    public class DictionaryResourcesService : IDictionaryResourcesService
+    {
+        #region CONSTRUCTORS
+
+        public DictionaryResourcesService() { }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public T Get<T>(string key)
+        {
+            Application.Current.Resources.TryGetValue(key, out object value);
+            if (value is not null && value is T cast)
+            {
+                return cast;
+            }
+            throw new KeyNotFoundException();
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
new file mode 100644
index 0000000..4a71f28
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>VDownload.Services.UI.DictionaryResources</RootNamespace>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
+	  <UseRidGraph>true</UseRidGraph>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+  </ItemGroup>
+</Project>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs
new file mode 100644
index 0000000..778aa50
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs
@@ -0,0 +1,36 @@
+using Microsoft.Windows.AppNotifications;
+using Microsoft.Windows.AppNotifications.Builder;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.UI.Notifications
+{
+    public interface INotificationsService
+    {
+        void SendNotification(string title, IEnumerable<string> message);
+    }
+
+
+
+    public class NotificationsService : INotificationsService
+    {
+        #region PUBLIC METHODS
+
+        public void SendNotification(string title, IEnumerable<string> message)
+        {
+            AppNotificationBuilder builder = new AppNotificationBuilder();
+            builder.AddText(title);
+            foreach (string text in message)
+            {
+                builder.AddText(text);
+            }
+            AppNotification notification = builder.BuildNotification();
+            AppNotificationManager.Default.Show(notification);
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
new file mode 100644
index 0000000..eb7e849
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>VDownload.Services.UI.Notifications</RootNamespace>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
+	  <UseRidGraph>true</UseRidGraph>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+  </ItemGroup>
+</Project>
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/FileSavePickerFileTypeChoice.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/FileSavePickerFileTypeChoice.cs
similarity index 93%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/FileSavePickerFileTypeChoice.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/FileSavePickerFileTypeChoice.cs
index 4e7d5fd..5b4d194 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/FileSavePickerFileTypeChoice.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/FileSavePickerFileTypeChoice.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.StoragePicker
+namespace VDownload.Services.UI.StoragePicker
 {
     public class FileSavePickerFileTypeChoice
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerService.cs
similarity index 97%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerService.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerService.cs
index d315e65..5981f8c 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerService.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerService.cs
@@ -1,16 +1,13 @@
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using WinRT.Interop;
 
-namespace VDownload.GUI.Services.StoragePicker
+namespace VDownload.Services.UI.StoragePicker
 {
     public interface IStoragePickerService
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerStartLocation.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerStartLocation.cs
similarity index 88%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerStartLocation.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerStartLocation.cs
index 48b7330..09123fa 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/StoragePickerStartLocation.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/StoragePickerStartLocation.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.StoragePicker
+namespace VDownload.Services.UI.StoragePicker
 {
     public enum StoragePickerStartLocation
     {
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
new file mode 100644
index 0000000..51d0af1
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>VDownload.Services.UI.StoragePicker</RootNamespace>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
+	  <UseRidGraph>true</UseRidGraph>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+  </ItemGroup>
+</Project>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResources.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResources.cs
new file mode 100644
index 0000000..e3a9691
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResources.cs
@@ -0,0 +1,37 @@
+using Windows.ApplicationModel.Resources;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.UI.StringResources
+{
+    public class StringResources
+    {
+        #region FIELDS
+
+        protected ResourceLoader _resourceLoader;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        internal StringResources(ResourceLoader resourceLoader)
+        {
+            _resourceLoader = resourceLoader;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public string Get(string key) => _resourceLoader.GetString(key);
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
new file mode 100644
index 0000000..81d85d0
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
@@ -0,0 +1,65 @@
+using VDownload.Services.Data.Configuration;
+using Windows.ApplicationModel.Resources;
+
+namespace VDownload.Services.UI.StringResources
+{
+    public interface IStringResourcesService
+    {
+        StringResources BaseViewResources { get; }
+        StringResources HomeViewResources { get; }
+        StringResources HomeVideoViewResources { get; }
+        StringResources HomeDownloadsViewResources { get; }
+        StringResources AuthenticationViewResources { get; }
+        StringResources NotificationsResources { get; }
+    }
+
+
+
+    public class StringResourcesService : IStringResourcesService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public StringResources BaseViewResources { get; protected set; }
+        public StringResources HomeViewResources { get; protected set; }
+        public StringResources HomeVideoViewResources { get; protected set; }
+        public StringResources HomeDownloadsViewResources { get; protected set; }
+        public StringResources AuthenticationViewResources { get; protected set; }
+        public StringResources NotificationsResources { get; protected set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public StringResourcesService(IConfigurationService configurationService)
+        {
+            _configurationService = configurationService;
+
+            BaseViewResources = BuildResource("BaseViewResources");
+            HomeViewResources = BuildResource("HomeViewResources");
+            HomeVideoViewResources = BuildResource("HomeVideoViewResources");
+            HomeDownloadsViewResources = BuildResource("HomeDownloadsViewResources");
+            AuthenticationViewResources = BuildResource("AuthenticationViewResources");
+            NotificationsResources = BuildResource("NotificationsResources");
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        protected StringResources BuildResource(string resourceName) => new StringResources(ResourceLoader.GetForViewIndependentUse($"{_configurationService.Common.StringResourcesAssembly}/{resourceName}"));
+
+        #endregion
+    }
+}
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/VDownload.GUI.Services.StoragePicker.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/VDownload.Services.UI.StringResources.csproj
similarity index 55%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/VDownload.GUI.Services.StoragePicker.csproj
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/VDownload.Services.UI.StringResources.csproj
index 35e6f46..93eaad4 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.StoragePicker/VDownload.GUI.Services.StoragePicker.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/VDownload.Services.UI.StringResources.csproj
@@ -2,20 +2,19 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Services.StoragePicker</RootNamespace>
+    <RootNamespace>VDownload.Services.UI.StringResources</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
+	  <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="StoragePickerService.cs">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </Compile>
+    <ProjectReference Include="..\..\..\VDownload.Core\VDownload.Core.Strings\VDownload.Core.Strings.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
   </ItemGroup>
 </Project>
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/VDownload.GUI.Services.WebView.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
similarity index 78%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/VDownload.GUI.Services.WebView.csproj
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
index c12b4e6..d469f7f 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/VDownload.GUI.Services.WebView.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
@@ -2,18 +2,17 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Services.WebView</RootNamespace>
+    <RootNamespace>VDownload.Services.UI.WebView</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
-    <UseRidGraph>true</UseRidGraph>
+	  <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="WebViewWindow.xaml" />
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewService.cs
similarity index 86%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewService.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewService.cs
index a301a5a..e6a1b2c 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewService.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewService.cs
@@ -1,11 +1,10 @@
-using Microsoft.Web.WebView2.Core;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Services.WebView
+namespace VDownload.Services.UI.WebView
 {
     public interface IWebViewService
     {
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml
similarity index 80%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml
index 797c184..5b40d42 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Window
-    x:Class="VDownload.GUI.Services.WebView.WebViewWindow"
+    x:Class="VDownload.Services.UI.WebView.WebViewWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.GUI.Services.WebView"
+    xmlns:local="using:VDownload.Services.UI.WebView"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml.cs
similarity index 97%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml.cs
rename to VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml.cs
index 215b53f..838a358 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.WebView/WebViewWindow.xaml.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/WebViewWindow.xaml.cs
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-namespace VDownload.GUI.Services.WebView
+namespace VDownload.Services.UI.WebView
 {
     public sealed partial class WebViewWindow : Window
     {
@@ -78,7 +78,7 @@ namespace VDownload.GUI.Services.WebView
                 this.Close();
             }
         }
-        
+
         private void Window_Closed(object sender, WindowEventArgs args)
         {
             _isOpened = false;
diff --git a/VDownload.Services/VDownload.Services.Encryption/EncryptionService.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.Encryption/EncryptionService.cs
similarity index 94%
rename from VDownload.Services/VDownload.Services.Encryption/EncryptionService.cs
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.Encryption/EncryptionService.cs
index 66b9cca..1fdaf56 100644
--- a/VDownload.Services/VDownload.Services.Encryption/EncryptionService.cs
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.Encryption/EncryptionService.cs
@@ -7,7 +7,7 @@ using System.Security.Cryptography;
 using System.Security;
 using System.Runtime.InteropServices;
 
-namespace VDownload.Services.Encryption
+namespace VDownload.Services.Utility.Encryption
 {
     public interface IEncryptionService
     {
diff --git a/VDownload.Services/VDownload.Services.Encryption/VDownload.Services.Encryption.csproj b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.Encryption/VDownload.Services.Utility.Encryption.csproj
similarity index 100%
rename from VDownload.Services/VDownload.Services.Encryption/VDownload.Services.Encryption.csproj
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.Encryption/VDownload.Services.Utility.Encryption.csproj
diff --git a/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegBuilder.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegBuilder.cs
new file mode 100644
index 0000000..8149330
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegBuilder.cs
@@ -0,0 +1,191 @@
+using FFMpegCore;
+using FFMpegCore.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+
+namespace VDownload.Services.Utility.FFmpeg
+{
+    public class FFmpegBuilder
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected TimeSpan? _trimStart;
+        protected TimeSpan? _trimEnd;
+
+        protected bool _progressReporterJoined = false;
+        protected Action<double> _progressReporter;
+        protected TimeSpan _progressReporterVideoDuration;
+
+        protected bool _cancellationTokenJoined = false;
+        protected CancellationToken _cancellationToken;
+
+        protected MediaType _mediaType = MediaType.Original;
+
+        protected string _inputFile;
+        protected string _outputFile;
+
+        protected FFOptions _options;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        internal FFmpegBuilder(IConfigurationService configurationService, ISettingsService settingsService)
+        {
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+
+            _options = new FFOptions
+            {
+                BinaryFolder = _settingsService.Data.Common.Processing.FFmpegLocation,
+            };
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public FFmpegBuilder SetMediaType(MediaType mediaType)
+        {
+            _mediaType = mediaType;
+            return this;
+        }
+
+        public FFmpegBuilder TrimStart(TimeSpan start)
+        {
+            _trimStart = start;
+            return this;
+        }
+
+        public FFmpegBuilder TrimEnd(TimeSpan end)
+        {
+            _trimEnd = end;
+            return this;
+        }
+
+        public FFmpegBuilder JoinProgressReporter(Action<double> progressReporter, TimeSpan videoDuration)
+        {
+            _progressReporterJoined = true;
+            _progressReporter = progressReporter;
+            _progressReporterVideoDuration = videoDuration;
+            return this;
+        }
+
+        public FFmpegBuilder JoinCancellationToken(CancellationToken cancellationToken)
+        {
+            _cancellationTokenJoined = true;
+            _cancellationToken = cancellationToken;
+            return this;
+        }
+
+        public async Task RunAsync(string inputFile, string outputFile)
+        {
+            _inputFile = inputFile;
+            _outputFile = outputFile;
+
+            FFMpegArgumentProcessor ffmpegArguments = FFMpegArguments.FromFileInput(inputFile, true, async (options) => await BuildInputArgumentOptions(options))
+                                                                     .OutputToFile(outputFile, true, async (options) => await BuildOutputArgumentOptions(options));
+
+            if (_cancellationTokenJoined)
+            {
+                ffmpegArguments = ffmpegArguments.CancellableThrough(_cancellationToken);
+            }
+
+            if (_progressReporterJoined)
+            {
+                ffmpegArguments = ffmpegArguments.NotifyOnProgress(_progressReporter, _progressReporterVideoDuration);
+            }
+
+            try
+            {
+                await ffmpegArguments.ProcessAsynchronously(true, _options);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                throw;
+            }
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private async Task BuildInputArgumentOptions(FFMpegArgumentOptions options)
+        {
+            options.UsingMultithreading(_settingsService.Data.Common.Processing.UseMultithreading);
+            options.WithSpeedPreset((Speed)_settingsService.Data.Common.Processing.Speed);
+            if (_settingsService.Data.Common.Processing.UseHardwareAcceleration)
+            {
+                options.WithHardwareAcceleration(HardwareAccelerationDevice.Auto);
+            }
+
+            if (_trimStart is not null)
+            {
+                options.WithCustomArgument($"-ss {_trimStart}");
+            }
+
+            if (_trimEnd is not null)
+            {
+                options.WithCustomArgument($"-to {_trimEnd}");
+            }
+        }
+
+        private async Task BuildOutputArgumentOptions(FFMpegArgumentOptions options)
+        {
+            IMediaAnalysis analysis = await FFProbe.AnalyseAsync(_inputFile, _options);
+            string audioCodec = analysis.AudioStreams.First().CodecName;
+            string videoCodec = analysis.VideoStreams.First().CodecName;
+
+            string extension = Path.GetExtension(_outputFile).Replace(".", string.Empty);
+            Data.Configuration.Models.Muxer muxer = _configurationService.Common.Processing.Muxers.First(x => x.Extension == extension);
+
+            if (_mediaType != MediaType.OnlyAudio)
+            {
+                IEnumerable<string> availableCodecs = muxer.VideoCodecs;
+                string selectedCodec = availableCodecs.Contains(videoCodec) ? "copy" : availableCodecs.First();
+                options.WithCustomArgument($"-vcodec {selectedCodec}");
+            }
+            else
+            {
+                options.WithCustomArgument("-vn");
+            }
+
+            if (_mediaType != MediaType.OnlyVideo)
+            {
+                IEnumerable<string> availableCodecs = muxer.AudioCodecs;
+                string selectedCodec = availableCodecs.Contains(audioCodec) ? "copy" : availableCodecs.First();
+                options.WithCustomArgument($"-acodec {selectedCodec}");
+            }
+            else
+            {
+                options.WithCustomArgument("-an");
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegService.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegService.cs
new file mode 100644
index 0000000..abbc6f4
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/FFmpegService.cs
@@ -0,0 +1,48 @@
+using FFMpegCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+
+namespace VDownload.Services.Utility.FFmpeg
+{
+    public interface IFFmpegService
+    {
+        FFmpegBuilder CreateBuilder();
+    }
+
+
+
+    public class FFmpegService : IFFmpegService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public FFmpegService(IConfigurationService configurationService, ISettingsService settingsService)
+        {
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public FFmpegBuilder CreateBuilder() => new FFmpegBuilder(_configurationService, _settingsService);
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/VDownload.Services.Utility.FFmpeg.csproj b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/VDownload.Services.Utility.FFmpeg.csproj
new file mode 100644
index 0000000..205d8dd
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.FFmpeg/VDownload.Services.Utility.FFmpeg.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FFMpegCore" Version="5.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\VDownload.Models\VDownload.Models.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.Services/VDownload.Services.HttpClient/HttpClientService.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpClientService.cs
similarity index 98%
rename from VDownload.Services/VDownload.Services.HttpClient/HttpClientService.cs
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpClientService.cs
index 3942aae..9ad8b5d 100644
--- a/VDownload.Services/VDownload.Services.HttpClient/HttpClientService.cs
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpClientService.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 using System.Reflection.PortableExecutable;
 using System.Collections;
 
-namespace VDownload.Services.HttpClient
+namespace VDownload.Services.Utility.HttpClient
 {
     public interface IHttpClientService
     {
diff --git a/VDownload.Services/VDownload.Services.HttpClient/HttpMethodType.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpMethodType.cs
similarity index 83%
rename from VDownload.Services/VDownload.Services.HttpClient/HttpMethodType.cs
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpMethodType.cs
index e0bd43d..eb445fe 100644
--- a/VDownload.Services/VDownload.Services.HttpClient/HttpMethodType.cs
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpMethodType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Services.HttpClient
+namespace VDownload.Services.Utility.HttpClient
 {
     public enum HttpMethodType
     {
diff --git a/VDownload.Services/VDownload.Services.HttpClient/HttpRequest.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpRequest.cs
similarity index 94%
rename from VDownload.Services/VDownload.Services.HttpClient/HttpRequest.cs
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpRequest.cs
index f18c53a..aa06fe0 100644
--- a/VDownload.Services/VDownload.Services.HttpClient/HttpRequest.cs
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/HttpRequest.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Services.HttpClient
+namespace VDownload.Services.Utility.HttpClient
 {
     public class HttpRequest
     {
diff --git a/VDownload.Services/VDownload.Services.HttpClient/Token.cs b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/Token.cs
similarity index 93%
rename from VDownload.Services/VDownload.Services.HttpClient/Token.cs
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/Token.cs
index c0e92ae..893cea2 100644
--- a/VDownload.Services/VDownload.Services.HttpClient/Token.cs
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/Token.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Services.HttpClient
+namespace VDownload.Services.Utility.HttpClient
 {
     public class Token
     {
diff --git a/VDownload.Services/VDownload.Services.HttpClient/VDownload.Services.HttpClient.csproj b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/VDownload.Services.Utility.HttpClient.csproj
similarity index 82%
rename from VDownload.Services/VDownload.Services.HttpClient/VDownload.Services.HttpClient.csproj
rename to VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/VDownload.Services.Utility.HttpClient.csproj
index 3e8a731..3b5b170 100644
--- a/VDownload.Services/VDownload.Services.HttpClient/VDownload.Services.HttpClient.csproj
+++ b/VDownload.Services/VDownload.Services.Utility/VDownload.Services.Utility.HttpClient/VDownload.Services.Utility.HttpClient.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Services/VDownload.Services/ServiceProvider.cs b/VDownload.Services/VDownload.Services/ServiceProvider.cs
deleted file mode 100644
index ee0fe4f..0000000
--- a/VDownload.Services/VDownload.Services/ServiceProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace VDownload.Services
-{
-    public class ServiceProvider
-    {
-        #region CONSTRUCTORS
-
-        public static IServiceProvider Instance { get; set; }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Common/ISourceSearchService.cs b/VDownload.Sources/VDownload.Sources.Common/ISourceSearchService.cs
new file mode 100644
index 0000000..8a26080
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Common/ISourceSearchService.cs
@@ -0,0 +1,10 @@
+using VDownload.Models;
+
+namespace VDownload.Sources.Common
+{
+    public interface ISourceSearchService
+    {
+        Task<Video> SearchVideo(string url);
+        Task<Playlist> SearchPlaylist(string url, int maxVideoCount);
+    }
+}
diff --git a/VDownload.Common/Exceptions/MediaSearchException.cs b/VDownload.Sources/VDownload.Sources.Common/MediaSearchException.cs
similarity index 92%
rename from VDownload.Common/Exceptions/MediaSearchException.cs
rename to VDownload.Sources/VDownload.Sources.Common/MediaSearchException.cs
index 01debc3..48e41a9 100644
--- a/VDownload.Common/Exceptions/MediaSearchException.cs
+++ b/VDownload.Sources/VDownload.Sources.Common/MediaSearchException.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Common.Exceptions
+namespace VDownload.Sources.Common
 {
     public class MediaSearchException : Exception
     {
diff --git a/VDownload.Services/VDownload.Services.Tasks/VDownload.Services.Tasks.csproj b/VDownload.Sources/VDownload.Sources.Common/VDownload.Sources.Common.csproj
similarity index 59%
rename from VDownload.Services/VDownload.Services.Tasks/VDownload.Services.Tasks.csproj
rename to VDownload.Sources/VDownload.Sources.Common/VDownload.Sources.Common.csproj
index fdff66b..9917f35 100644
--- a/VDownload.Services/VDownload.Services.Tasks/VDownload.Services.Tasks.csproj
+++ b/VDownload.Sources/VDownload.Sources.Common/VDownload.Sources.Common.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\VDownload.Common\VDownload.Common.csproj" />
-    <ProjectReference Include="..\..\VDownload.Tasks\VDownload.Tasks.csproj" />
+    <ProjectReference Include="..\..\VDownload.Models\VDownload.Models.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/TwitchApiService.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/TwitchApiService.cs
index 1f2121d..19752fd 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/TwitchApiService.cs
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/TwitchApiService.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Services.HttpClient;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Utility.HttpClient;
 using VDownload.Sources.Twitch.Api.GQL.GetVideoToken.Response;
 using VDownload.Sources.Twitch.Api.Helix.GetVideos.Response;
-using VDownload.Sources.Twitch.Configuration;
 using VDownload.Sources.Twitch.Search.Models.GetVideoToken.Request;
 
 namespace VDownload.Sources.Twitch.Api
@@ -25,12 +20,8 @@ namespace VDownload.Sources.Twitch.Api
     {
         #region SERVICES
 
-        private readonly TwitchApiAuthConfiguration _apiAuthConfiguration;
-        private readonly TwitchApiHelixConfiguration _apiHelixConfiguration;
-        private readonly TwitchApiGQLConfiguration _apiGQLConfiguration;
-        private readonly TwitchApiUsherConfiguration _apiUsherConfiguration;
-
-        private readonly IHttpClientService _httpClientService;
+        protected readonly IConfigurationService _configurationService;
+        protected readonly IHttpClientService _httpClientService;
 
         #endregion
 
@@ -38,13 +29,9 @@ namespace VDownload.Sources.Twitch.Api
 
         #region CONSTRUCTORS
 
-        public TwitchApiService(TwitchConfiguration configuration, IHttpClientService httpClientService)
+        public TwitchApiService(IConfigurationService configurationService, IHttpClientService httpClientService)
         {
-            _apiAuthConfiguration = configuration.Api.Auth;
-            _apiHelixConfiguration = configuration.Api.Helix;
-            _apiGQLConfiguration = configuration.Api.GQL;
-            _apiUsherConfiguration = configuration.Api.Usher;
-
+            _configurationService = configurationService;
             _httpClientService = httpClientService;
         }
 
@@ -56,31 +43,30 @@ namespace VDownload.Sources.Twitch.Api
 
         public async Task<string> AuthValidate(byte[] token)
         {
-            Token tokenData = new Token(_apiAuthConfiguration.TokenSchema, token);
-            HttpRequest request = new HttpRequest(HttpMethodType.GET, _apiAuthConfiguration.Endpoints.Validate);
+            Token tokenData = new Token(_configurationService.Twitch.Api.Auth.TokenSchema, token);
+            HttpRequest request = new HttpRequest(HttpMethodType.GET, _configurationService.Twitch.Api.Auth.Endpoints.Validate);
             request.Headers.Add("Authorization", $"{tokenData}");
             return await _httpClientService.SendRequestAsync(request);
         }
 
         public async Task<GetVideosResponse> HelixGetVideos(string id, byte[] token)
         {
-            Token tokenData = new Token(_apiHelixConfiguration.TokenSchema, token);
+            Token tokenData = new Token(_configurationService.Twitch.Api.Helix.TokenSchema, token);
 
-            HttpRequest request = new HttpRequest(HttpMethodType.GET, _apiHelixConfiguration.Endpoints.GetVideos);
+            HttpRequest request = new HttpRequest(HttpMethodType.GET, _configurationService.Twitch.Api.Helix.Endpoints.GetVideos);
             request.Query.Add("id", id);
             request.Headers.Add("Authorization", tokenData.ToString());
-            request.Headers.Add("Client-Id", _apiHelixConfiguration.ClientId);
+            request.Headers.Add("Client-Id", _configurationService.Twitch.Api.Helix.ClientId);
 
             return await _httpClientService.SendRequestAsync<GetVideosResponse>(request);
         }
 
         public async Task<GetVideoTokenResponse> GQLGetVideoToken(string id)
         {
-            TwitchApiGQLQueriesQueryExtendedConfiguration configuration = _apiGQLConfiguration.Queries.GetVideoToken;
             GetVideoTokenRequest requestBody = new GetVideoTokenRequest
             {
-                OperationName = configuration.OperationName,
-                Query = configuration.Query,
+                OperationName = _configurationService.Twitch.Api.Gql.Queries.GetVideoToken.OperationName,
+                Query = _configurationService.Twitch.Api.Gql.Queries.GetVideoToken.Query,
                 Variables = new GetVideoTokenVariables
                 {
                     IsLive = false,
@@ -91,17 +77,17 @@ namespace VDownload.Sources.Twitch.Api
                 }
             };
 
-            HttpRequest request = new HttpRequest(HttpMethodType.POST, _apiGQLConfiguration.Endpoint)
+            HttpRequest request = new HttpRequest(HttpMethodType.POST, _configurationService.Twitch.Api.Gql.Endpoint)
             {
                 Body = requestBody,
             };
-            request.Headers.Add("Client-Id", _apiGQLConfiguration.ClientId);
+            request.Headers.Add("Client-Id", _configurationService.Twitch.Api.Gql.ClientId);
             return await _httpClientService.SendRequestAsync<GetVideoTokenResponse>(request);
         }
 
         public async Task<string> UsherGetVideoPlaylist(string id, string videoToken, string videoTokenSignature)
         {
-            string url = string.Format(_apiUsherConfiguration.Endpoints.GetVideoPlaylist, id);
+            string url = string.Format(_configurationService.Twitch.Api.Usher.Endpoints.GetVideoPlaylist, id);
             HttpRequest request = new HttpRequest(HttpMethodType.GET, url);
             request.Query.Add("token", videoToken);
             request.Query.Add("sig", videoTokenSignature);
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/VDownload.Sources.Twitch.Api.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/VDownload.Sources.Twitch.Api.csproj
index 164e43b..b43303d 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/VDownload.Sources.Twitch.Api.csproj
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Api/VDownload.Sources.Twitch.Api.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.HttpClient\VDownload.Services.HttpClient.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch.Configuration\VDownload.Sources.Twitch.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.HttpClient\VDownload.Services.Utility.HttpClient.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/TwitchAuthenticationService.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/TwitchAuthenticationService.cs
index 6be8f44..13c912c 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/TwitchAuthenticationService.cs
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/TwitchAuthenticationService.cs
@@ -1,40 +1,18 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using VDownload.Services.Authentication;
-using VDownload.Services.Encryption;
-using VDownload.Services.HttpClient;
+using VDownload.Services.Data.Authentication;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Utility.Encryption;
+using VDownload.Sources.Twitch.Api;
 using VDownload.Sources.Twitch.Authentication.Models;
-using VDownload.Sources.Twitch.Configuration;
 
 namespace VDownload.Sources.Twitch.Authentication
 {
     public interface ITwitchAuthenticationService
     {
-        #region PROPERTIES
-
-        string AuthenticationPageUrl { get; }
-        Regex AuthenticationPageRedirectUrlRegex { get; }
-
-
-        #endregion
-
-
-
-        #region METHODS
-
+        Task DeleteToken();
         Task<byte[]?> GetToken();
         Task SetToken(byte[] token);
-        Task DeleteToken();
         Task<TwitchValidationResult> ValidateToken(byte[] token);
-        bool AuthenticationPageClosePredicate(string url);
-
-        #endregion
     }
 
 
@@ -43,21 +21,10 @@ namespace VDownload.Sources.Twitch.Authentication
     {
         #region SERVICES
 
-        private TwitchAuthenticationConfiguration _authenticationConfiguration;
-        private TwitchApiAuthConfiguration _apiAuthConfiguration;
-
-        private IHttpClientService _httpClientService;
-        private IAuthenticationService _authenticationService;
-        private IEncryptionService _encryptionService;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        public string AuthenticationPageUrl { get; private set; }
-        public Regex AuthenticationPageRedirectUrlRegex { get; private set; }
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ITwitchApiService _apiService;
+        protected readonly IAuthenticationDataService _authenticationDataService;
+        protected readonly IEncryptionService _encryptionService;
 
         #endregion
 
@@ -65,17 +32,12 @@ namespace VDownload.Sources.Twitch.Authentication
 
         #region CONSTRUCTORS
 
-        public TwitchAuthenticationService(TwitchConfiguration configuration, IHttpClientService httpClientService, IAuthenticationService authenticationService, IEncryptionService encryptionService) 
+        public TwitchAuthenticationService(IConfigurationService configurationService, ITwitchApiService apiService, IAuthenticationDataService authenticationDataService, IEncryptionService encryptionService)
         {
-            _authenticationConfiguration = configuration.Authentication;
-            _apiAuthConfiguration = configuration.Api.Auth;
-
-            _httpClientService = httpClientService;
-            _authenticationService = authenticationService;
+            _configurationService = configurationService;
+            _apiService = apiService;
+            _authenticationDataService = authenticationDataService;
             _encryptionService = encryptionService;
-
-            AuthenticationPageUrl = string.Format(_authenticationConfiguration.Url, _authenticationConfiguration.ClientId, _authenticationConfiguration.RedirectUrl, _authenticationConfiguration.ResponseType, string.Join(' ', _authenticationConfiguration.Scopes));
-            AuthenticationPageRedirectUrlRegex = _authenticationConfiguration.RedirectUrlRegex;
         }
 
         #endregion
@@ -86,11 +48,11 @@ namespace VDownload.Sources.Twitch.Authentication
 
         public async Task<byte[]?> GetToken()
         {
-            await _authenticationService.Load();
+            await _authenticationDataService.Load();
 
-            byte[]? tokenEncrypted = _authenticationService.AuthenticationData.Twitch.Token;
+            byte[]? tokenEncrypted = _authenticationDataService.Data.Twitch.Token;
 
-            if (tokenEncrypted is not null && tokenEncrypted.Length == 0) 
+            if (tokenEncrypted is not null && tokenEncrypted.Length == 0)
             {
                 tokenEncrypted = null;
             }
@@ -105,30 +67,27 @@ namespace VDownload.Sources.Twitch.Authentication
 
         public async Task SetToken(byte[] token)
         {
-            Task loadTask = _authenticationService.Load();
+            Task loadTask = _authenticationDataService.Load();
 
             byte[] tokenEncrypted = _encryptionService.Encrypt(token);
 
             await loadTask;
 
-            _authenticationService.AuthenticationData.Twitch.Token = tokenEncrypted;
+            _authenticationDataService.Data.Twitch.Token = tokenEncrypted;
 
-            await _authenticationService.Save();
+            await _authenticationDataService.Save();
         }
 
         public async Task DeleteToken()
         {
-            await _authenticationService.Load();
-            _authenticationService.AuthenticationData.Twitch.Token = null;
-            await _authenticationService.Save();
+            await _authenticationDataService.Load();
+            _authenticationDataService.Data.Twitch.Token = null;
+            await _authenticationDataService.Save();
         }
 
         public async Task<TwitchValidationResult> ValidateToken(byte[] token)
         {
-            Token tokenData = new Token(_apiAuthConfiguration.TokenSchema, token);
-            HttpRequest request = new HttpRequest(HttpMethodType.GET, _apiAuthConfiguration.Endpoints.Validate);
-            request.Headers.Add("Authorization", $"{tokenData}");
-            string response = await _httpClientService.SendRequestAsync(request);
+            string response = await _apiService.AuthValidate(token);
 
             try
             {
@@ -136,7 +95,7 @@ namespace VDownload.Sources.Twitch.Authentication
                 return new TwitchValidationResult(success);
             }
             catch (JsonSerializationException)
-            {}
+            { }
 
             try
             {
@@ -144,17 +103,11 @@ namespace VDownload.Sources.Twitch.Authentication
                 return new TwitchValidationResult(fail);
             }
             catch (JsonSerializationException)
-            {}
+            { }
 
             throw new Exception(response);
         }
 
-        public bool AuthenticationPageClosePredicate(string url)
-        {
-            bool close = url.StartsWith(_authenticationConfiguration.RedirectUrl);
-            return close;
-        }
-
         #endregion
     }
 }
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/VDownload.Sources.Twitch.Authentication.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/VDownload.Sources.Twitch.Authentication.csproj
index e6b7f06..0358038 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/VDownload.Sources.Twitch.Authentication.csproj
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Authentication/VDownload.Sources.Twitch.Authentication.csproj
@@ -7,15 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Authentication\VDownload.Services.Authentication.csproj" />
-    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Encryption\VDownload.Services.Encryption.csproj" />
-    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.HttpClient\VDownload.Services.HttpClient.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch.Configuration\VDownload.Sources.Twitch.Configuration.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Authentication\VDownload.Services.Data.Authentication.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.Encryption\VDownload.Services.Utility.Encryption.csproj" />
+    <ProjectReference Include="..\VDownload.Sources.Twitch.Api\VDownload.Sources.Twitch.Api.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Api.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Api.cs
new file mode 100644
index 0000000..8a42839
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Api.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.Configuration;
+using System.Text.Json.Serialization; 
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Api
+    {
+        [ConfigurationKeyName("auth")]
+        public Auth Auth { get; set; }
+
+        [ConfigurationKeyName("helix")]
+        public Helix Helix { get; set; }
+
+        [ConfigurationKeyName("gql")]
+        public Gql Gql { get; set; }
+
+        [ConfigurationKeyName("usher")]
+        public Usher Usher { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Auth.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Auth.cs
new file mode 100644
index 0000000..37fd341
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Auth.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Auth
+    {
+        [ConfigurationKeyName("token_schema")]
+        public string TokenSchema { get; set; }
+
+        [ConfigurationKeyName("client_id")]
+        public string ClientId { get; set; }
+
+        [ConfigurationKeyName("endpoints")]
+        public EndpointsAuth Endpoints { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Authentication.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Authentication.cs
new file mode 100644
index 0000000..908e9b0
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Authentication.cs
@@ -0,0 +1,31 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace VDownload.Sources.Twitch.Configuration.Models
+{
+    public class Authentication
+    {
+        [ConfigurationKeyName("url")]
+        public string Url { get; set; }
+
+        [ConfigurationKeyName("redirect_url")]
+        public string RedirectUrl { get; set; }
+
+        [ConfigurationKeyName("redirect_url_regex")]
+        public string RedirectUrlRegex { get; set; }
+
+        [ConfigurationKeyName("client_id")]
+        public string ClientId { get; set; }
+
+        [ConfigurationKeyName("response_type")]
+        public string ResponseType { get; set; }
+
+        [ConfigurationKeyName("scopes")]
+        public List<string> Scopes { get; } = new List<string>();
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Download.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Download.cs
new file mode 100644
index 0000000..db91b2d
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Download.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Download
+    {
+        [ConfigurationKeyName("vod")]
+        public Vod Vod { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsAuth.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsAuth.cs
new file mode 100644
index 0000000..030bc2e
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsAuth.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class EndpointsAuth
+    {
+        [ConfigurationKeyName("validate")]
+        public string Validate { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsHelix.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsHelix.cs
new file mode 100644
index 0000000..9965d26
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsHelix.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+
+namespace VDownload.Sources.Twitch.Configuration.Models
+{
+    public class EndpointsHelix
+    {
+        [ConfigurationKeyName("get_videos")]
+        public string GetVideos { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsUsher.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsUsher.cs
new file mode 100644
index 0000000..8894b66
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/EndpointsUsher.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+
+namespace VDownload.Sources.Twitch.Configuration.Models
+{
+    public class EndpointsUsher
+    {
+        [ConfigurationKeyName("get_video_playlist")]
+        public string GetVideoPlaylist { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/GetVideoToken.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/GetVideoToken.cs
new file mode 100644
index 0000000..f8ae61f
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/GetVideoToken.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class GetVideoToken
+    {
+        [ConfigurationKeyName("operation_name")]
+        public string OperationName { get; set; }
+
+        [ConfigurationKeyName("query")]
+        public string Query { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Gql.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Gql.cs
new file mode 100644
index 0000000..c18d88f
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Gql.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Gql
+    {
+        [ConfigurationKeyName("client_id")]
+        public string ClientId { get; set; }
+
+        [ConfigurationKeyName("endpoint")]
+        public string Endpoint { get; set; }
+
+        [ConfigurationKeyName("queries")]
+        public Queries Queries { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Helix.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Helix.cs
new file mode 100644
index 0000000..41b9ba2
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Helix.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Helix
+    {
+        [ConfigurationKeyName("token_schema")]
+        public string TokenSchema { get; set; }
+
+        [ConfigurationKeyName("client_id")]
+        public string ClientId { get; set; }
+
+        [ConfigurationKeyName("endpoints")]
+        public EndpointsHelix Endpoints { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Queries.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Queries.cs
new file mode 100644
index 0000000..17e9b66
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Queries.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Queries
+    {
+        [ConfigurationKeyName("get_video_token")]
+        public GetVideoToken GetVideoToken { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Search.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Search.cs
new file mode 100644
index 0000000..bb2800b
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Search.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Search
+    {
+        [ConfigurationKeyName("general_regexes")]
+        public List<string> GeneralRegexes { get; } = new List<string>();
+
+        [ConfigurationKeyName("vod")]
+        public Vod Vod { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Thumbnail.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Thumbnail.cs
new file mode 100644
index 0000000..78bb488
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Thumbnail.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Thumbnail
+    {
+        [ConfigurationKeyName("width")]
+        public int Width { get; set; }
+
+        [ConfigurationKeyName("height")]
+        public int Height { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Usher.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Usher.cs
new file mode 100644
index 0000000..793c2ae
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Usher.cs
@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Usher
+    {
+        [ConfigurationKeyName("endpoints")]
+        public EndpointsUsher Endpoints { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Vod.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Vod.cs
new file mode 100644
index 0000000..bd91b7e
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Vod.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Configuration;
+namespace VDownload.Sources.Twitch.Configuration.Models{ 
+
+    public class Vod
+    {
+        [ConfigurationKeyName("regexes")]
+        public List<string> Regexes { get; } = new List<string>();
+
+        [ConfigurationKeyName("thumbnail")]
+        public Thumbnail Thumbnail { get; set; }
+
+        [ConfigurationKeyName("stream_playlist_regex")]
+        public string StreamPlaylistRegex { get; set; }
+
+        [ConfigurationKeyName("chunk_regex")]
+        public string ChunkRegex { get; set; }
+
+        [ConfigurationKeyName("file_name")]
+        public string FileName { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthConfiguration.cs
deleted file mode 100644
index a41be13..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthConfiguration.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiAuthConfiguration
-    {
-        #region PROPERTIES
-
-        public string TokenSchema { get; protected set; }
-        public string ClientId { get; protected set; }
-        public TwitchApiAuthEndpointsConfiguration Endpoints { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiAuthConfiguration(IConfigurationSection configuration)
-        {
-            TokenSchema = configuration["token_schema"];
-            ClientId = configuration["client_id"];
-            Endpoints = new TwitchApiAuthEndpointsConfiguration(configuration.GetSection("endpoints"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthEndpointsConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthEndpointsConfiguration.cs
deleted file mode 100644
index a3bac8e..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiAuthEndpointsConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiAuthEndpointsConfiguration
-    {
-        #region PROPERTIES
-
-        public string Validate { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiAuthEndpointsConfiguration(IConfigurationSection configuration)
-        {
-            Validate = configuration["validate"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiConfiguration.cs
deleted file mode 100644
index 0c96ba2..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiConfiguration.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiConfiguration
-    {
-        #region PROPERTIES
-
-        public TwitchApiAuthConfiguration Auth { get; protected set; }
-        public TwitchApiHelixConfiguration Helix { get; protected set; }
-        public TwitchApiGQLConfiguration GQL { get; protected set; }
-        public TwitchApiUsherConfiguration Usher { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiConfiguration(IConfigurationSection configuration)
-        {
-            Auth = new TwitchApiAuthConfiguration(configuration.GetSection("auth"));
-            Helix = new TwitchApiHelixConfiguration(configuration.GetSection("helix"));
-            GQL = new TwitchApiGQLConfiguration(configuration.GetSection("gql"));
-            Usher = new TwitchApiUsherConfiguration(configuration.GetSection("usher"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLConfiguration.cs
deleted file mode 100644
index c4b0f4f..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLConfiguration.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiGQLConfiguration
-    {
-        #region PROPERTIES
-
-        public string ClientId { get; protected set; }
-        public string Endpoint { get; protected set; }
-        public TwitchApiGQLQueriesConfiguration Queries { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiGQLConfiguration(IConfigurationSection configuration)
-        {
-            ClientId = configuration["client_id"];
-            Endpoint = configuration["endpoint"];
-            Queries = new TwitchApiGQLQueriesConfiguration(configuration.GetSection("queries"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesConfiguration.cs
deleted file mode 100644
index 2b2ef77..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiGQLQueriesConfiguration
-    {
-        #region PROPERTIES
-
-        public TwitchApiGQLQueriesQueryExtendedConfiguration GetVideoToken { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiGQLQueriesConfiguration(IConfigurationSection configuration)
-        {
-            GetVideoToken = new TwitchApiGQLQueriesQueryExtendedConfiguration(configuration.GetSection("get_video_token"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryConfiguration.cs
deleted file mode 100644
index c20de62..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiGQLQueriesQueryConfiguration
-    {
-        #region PROPERTIES
-
-        public string Query { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiGQLQueriesQueryConfiguration(IConfigurationSection configuration)
-        {
-            Query = configuration["query"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryExtendedConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryExtendedConfiguration.cs
deleted file mode 100644
index c0cf00d..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiGQLQueriesQueryExtendedConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiGQLQueriesQueryExtendedConfiguration : TwitchApiGQLQueriesQueryConfiguration
-    {
-        #region PROPERTIES
-
-        public string OperationName { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiGQLQueriesQueryExtendedConfiguration(IConfigurationSection configuration) : base(configuration)
-        {
-            OperationName = configuration["operation_name"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixConfiguration.cs
deleted file mode 100644
index f96760b..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixConfiguration.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiHelixConfiguration
-    {
-        #region PROPERTIES
-
-        public string TokenSchema { get; protected set; }
-        public string ClientId { get; protected set; }
-        public TwitchApiHelixEndpointsConfiguration Endpoints { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiHelixConfiguration(IConfigurationSection configuration)
-        {
-            TokenSchema = configuration["token_schema"];
-            ClientId = configuration["client_id"];
-            Endpoints = new TwitchApiHelixEndpointsConfiguration(configuration.GetSection("endpoints"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixEndpointsConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixEndpointsConfiguration.cs
deleted file mode 100644
index 52cd586..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiHelixEndpointsConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiHelixEndpointsConfiguration
-    {
-        #region PROPERTIES
-
-        public string GetVideos { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiHelixEndpointsConfiguration(IConfigurationSection configuration)
-        {
-            GetVideos = configuration["get_videos"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherConfiguration.cs
deleted file mode 100644
index 0b5043a..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiUsherConfiguration
-    {
-        #region PROPERTIES
-
-        public TwitchApiUsherEndpointsConfiguration Endpoints { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiUsherConfiguration(IConfigurationSection configuration)
-        {
-            Endpoints = new TwitchApiUsherEndpointsConfiguration(configuration.GetSection("endpoints"));
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherEndpointsConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherEndpointsConfiguration.cs
deleted file mode 100644
index 741b98e..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchApiUsherEndpointsConfiguration.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchApiUsherEndpointsConfiguration
-    {
-        #region PROPERTIES
-
-        public string GetVideoPlaylist { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchApiUsherEndpointsConfiguration(IConfigurationSection configuration)
-        {
-            GetVideoPlaylist = configuration["get_video_playlist"];
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchAuthenticationConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchAuthenticationConfiguration.cs
deleted file mode 100644
index 6191236..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchAuthenticationConfiguration.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchAuthenticationConfiguration
-    {
-        #region PROPERTIES
-
-        public string Url { get; protected set; }
-        public string RedirectUrl { get; protected set; }
-        public Regex RedirectUrlRegex { get; protected set; }
-        public string ClientId { get; protected set; }
-        public string ResponseType { get; protected set; }
-        public IEnumerable<string> Scopes { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchAuthenticationConfiguration(IConfigurationSection configuration)
-        {
-            Url = configuration["url"];
-            RedirectUrl = configuration["redirect_url"];
-            RedirectUrlRegex = new Regex(configuration["redirect_url_regex"]);
-            ClientId = configuration["client_id"];
-            ResponseType = configuration["response_type"];
-            Scopes = configuration.GetSection("scopes").Get<IEnumerable<string>>();
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchConfiguration.cs
index 6606eb6..03ac634 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchConfiguration.cs
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchConfiguration.cs
@@ -3,33 +3,24 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using VDownload.Sources.Twitch.Configuration.Models;
 
 namespace VDownload.Sources.Twitch.Configuration
 {
     public class TwitchConfiguration
     {
-        #region PROPERTIES
+        [ConfigurationKeyName("api")]
+        public Api Api { get; set; }
 
-        public TwitchApiConfiguration Api { get; protected set; }
-        public TwitchSearchConfiguration Search { get; protected set; }
-        public TwitchAuthenticationConfiguration Authentication { get; protected set; }
+        [ConfigurationKeyName("search")]
+        public Search Search { get; set; }
 
-        #endregion
+        [ConfigurationKeyName("download")]
+        public Download Download { get; set; }
 
-
-
-        #region CONSTRUCTORS
-
-        public TwitchConfiguration(IConfiguration configuration)
-        {
-            IConfigurationSection section = configuration.GetSection("sources").GetSection("twitch");
-            Api = new TwitchApiConfiguration(section.GetSection("api"));
-            Search = new TwitchSearchConfiguration(section.GetSection("search"));
-            Authentication = new TwitchAuthenticationConfiguration(section.GetSection("authentication"));
-        }
-
-        #endregion
+        [ConfigurationKeyName("authentication")]
+        public Authentication Authentication { get; set; }
     }
 }
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchSearchConfiguration.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchSearchConfiguration.cs
deleted file mode 100644
index f278a48..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/TwitchSearchConfiguration.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace VDownload.Sources.Twitch.Configuration
-{
-    public class TwitchSearchConfiguration
-    {
-        #region PROPERTIES
-
-        public IEnumerable<Regex> GeneralRegexes { get; protected set; }
-        public IEnumerable<Regex> VodRegexes { get; protected set; }
-        public Regex VodStreamPlaylistRegex { get; protected set; }
-        public int VodThumbnailWidth { get; protected set; }
-        public int VodThumbnailHeight { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        internal TwitchSearchConfiguration(IConfigurationSection configuration)
-        {
-            GeneralRegexes = configuration.GetSection("general_regexes").Get<IEnumerable<string>>().Select(x => new Regex(x));
-            VodRegexes = configuration.GetSection("vod_regexes").Get<IEnumerable<string>>().Select(x => new Regex(x));
-            VodStreamPlaylistRegex = new Regex(configuration["vod_stream_playlist_regex"]);
-            VodThumbnailWidth = int.Parse(configuration["vod_thumbnail_width"]);
-            VodThumbnailHeight = int.Parse(configuration["vod_thumbnail_height"]);
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/VDownload.Sources.Twitch.Configuration.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/VDownload.Sources.Twitch.Configuration.csproj
index d843309..85f7f36 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/VDownload.Sources.Twitch.Configuration.csproj
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/VDownload.Sources.Twitch.Configuration.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/Internal/TwitchVodChunk.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/Internal/TwitchVodChunk.cs
new file mode 100644
index 0000000..3820447
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/Internal/TwitchVodChunk.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Sources.Twitch.Models.Internal
+{
+    internal class TwitchVodChunk
+    {
+        public required string Location { get; init; }
+        public required string Url { get; init; }
+        public required long Index { get; init; }
+        public required TimeSpan Duration { get; init; }
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchPlaylist.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchPlaylist.cs
similarity index 74%
rename from VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchPlaylist.cs
rename to VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchPlaylist.cs
index 9644887..4801ce5 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchPlaylist.cs
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchPlaylist.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using VDownload.Common;
+using VDownload.Models;
 
-namespace VDownload.Sources.Twitch
+namespace VDownload.Sources.Twitch.Models
 {
     public abstract class TwitchPlaylist : Playlist
     {
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVideo.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVideo.cs
new file mode 100644
index 0000000..0e56392
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVideo.cs
@@ -0,0 +1,16 @@
+using VDownload.Models;
+
+namespace VDownload.Sources.Twitch.Models
+{
+    public abstract class TwitchVideo : Video
+    {
+        #region CONSTRUCTORS
+
+        protected TwitchVideo()
+        {
+            Source = Source.Twitch;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVod.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVod.cs
similarity index 80%
rename from VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVod.cs
rename to VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVod.cs
index 4069765..374a6ca 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVod.cs
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVod.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.Sources.Twitch
+namespace VDownload.Sources.Twitch.Models
 {
     public class TwitchVod : TwitchVideo
     {
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVodStream.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVodStream.cs
new file mode 100644
index 0000000..c5e97e0
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchVodStream.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Threading.Tasks.Dataflow;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using VDownload.Sources.Twitch.Models.Internal;
+
+namespace VDownload.Sources.Twitch.Models
+{
+    public class TwitchVodStream : VideoStream
+    {
+        #region SERVICES
+
+        protected readonly HttpClient _httpClient;
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public string UrlM3U8 { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string VideoCodec { get; set; }
+        public string AudioCodec { get; set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public TwitchVodStream(HttpClient httpClient, IConfigurationService configurationService, ISettingsService settingsService)
+        {
+            _httpClient = httpClient;
+
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public async override Task<VideoStreamDownloadResult> Download(string taskTemporaryDirectory, IProgress<double> onProgress, CancellationToken token, TimeSpan trimStart, TimeSpan trimEnd)
+        {
+            token.ThrowIfCancellationRequested();
+
+            string m3u8 = await _httpClient.GetStringAsync(UrlM3U8, token);
+
+            token.ThrowIfCancellationRequested();
+
+            string m3u8BaseUrl = Path.GetDirectoryName(UrlM3U8).Replace("https:\\", "https://").Replace("http:\\", "http://").Replace('\\', '/');
+            Regex regex = new Regex(_configurationService.Twitch.Download.Vod.ChunkRegex);
+            MatchCollection matches = regex.Matches(m3u8);
+            long index = 0;
+
+            List<TwitchVodChunk> chunks = new List<TwitchVodChunk>();
+            foreach (Match match in matches)
+            {
+                token.ThrowIfCancellationRequested();
+
+                string filename = match.Groups["file"].Value;
+                string durationString = match.Groups["duration"].Value;
+
+                TimeSpan chunkDuration = TimeSpan.FromSeconds(double.Parse(durationString, CultureInfo.InvariantCulture));
+                string url = $"{m3u8BaseUrl}/{filename}";
+                string location = Path.Combine(taskTemporaryDirectory, filename);
+
+                chunks.Add(new TwitchVodChunk
+                {
+                    Url = url,
+                    Index = index,
+                    Duration = chunkDuration,
+                    Location = location
+                });
+
+                index++;
+            }
+
+            token.ThrowIfCancellationRequested();
+
+            TimeSpan duration = TimeSpan.FromTicks(chunks.Sum(x => x.Duration.Ticks));
+
+            if (_settingsService.Data.Twitch.Vod.PassiveTrimming)
+            {
+                PassiveTrimming(chunks, ref trimStart, ref trimEnd, ref duration);
+            }
+
+            token.ThrowIfCancellationRequested();
+
+            long downloadedCount = 0;
+            Action taskEnd = () =>
+            {
+                downloadedCount++;
+                double progress = ((double)downloadedCount / chunks.Count) * 100;
+                onProgress.Report(progress);
+            };
+            ActionBlock<TwitchVodChunk> block = new ActionBlock<TwitchVodChunk>(x => DownloadChunk(x, token, taskEnd), new ExecutionDataflowBlockOptions
+            {
+                MaxDegreeOfParallelism = _settingsService.Data.Twitch.Vod.MaxNumberOfParallelDownloads
+            });
+            foreach (TwitchVodChunk chunk in chunks)
+            {
+                block.Post(chunk);
+            }
+            block.Complete();
+            await block.Completion;
+
+            token.ThrowIfCancellationRequested();
+
+            string file = Path.Combine(taskTemporaryDirectory, _configurationService.Twitch.Download.Vod.FileName);
+            MergeFiles(file, chunks.Select(x => x.Location), token, true);
+
+            return new VideoStreamDownloadResult
+            {
+                File = file,
+                NewTrimStart = trimStart,
+                NewTrimEnd = trimEnd,
+                NewDuration = duration,
+            };
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        private void MergeFiles(string destinationPath, IEnumerable<string> sourceFiles, CancellationToken token, bool deleteSource = false)
+        {
+            using (FileStream outputStream = File.Create(destinationPath))
+            {
+                foreach (string path in sourceFiles)
+                {
+                    token.ThrowIfCancellationRequested();
+
+                    using (FileStream inputStream = File.OpenRead(path))
+                    {
+                        inputStream.CopyTo(outputStream);
+                    }
+
+                    if (deleteSource)
+                    {
+                        File.Delete(path);
+                    }
+                }
+            }
+        }
+
+        private void PassiveTrimming(List<TwitchVodChunk> chunks, ref TimeSpan trimStart, ref TimeSpan trimEnd, ref TimeSpan duration)
+        {
+            while (chunks.First().Duration <= trimStart)
+            {
+                TwitchVodChunk chunk = chunks.First();
+                TimeSpan chunkDuration = chunk.Duration;
+                trimStart -= chunkDuration;
+                trimEnd -= chunkDuration;
+                duration -= chunkDuration;
+                chunks.Remove(chunk);
+            }
+
+            while (chunks.Last().Duration <= duration.Subtract(trimEnd))
+            {
+                TwitchVodChunk chunk = chunks.Last();
+                TimeSpan chunkDuration = chunk.Duration;
+                duration -= chunkDuration;
+                chunks.Remove(chunk);
+            }
+        }
+
+        private async Task DownloadChunk(TwitchVodChunk chunk, CancellationToken token, Action onTaskEndSuccessfully)
+        {
+            int retriesCount = 0;
+            while (true)
+            {
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
+                try
+                {
+                    byte[] data = await _httpClient.GetByteArrayAsync(chunk.Url, token);
+                    await File.WriteAllBytesAsync(chunk.Location, data, token);
+                    onTaskEndSuccessfully.Invoke();
+                    return;
+                }
+                catch (OperationCanceledException)
+                {
+                    return;
+                }
+                catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException)
+                {
+                    if (_settingsService.Data.Twitch.Vod.ChunkDownloadingError.Retry && retriesCount < _settingsService.Data.Twitch.Vod.ChunkDownloadingError.RetriesCount)
+                    {
+                        retriesCount++;
+                        await Task.Delay(_settingsService.Data.Twitch.Vod.ChunkDownloadingError.RetryDelay);
+                    }
+                    else throw;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj
new file mode 100644
index 0000000..a4c545f
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\VDownload.Models\VDownload.Models.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/TwitchSearchService.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/TwitchSearchService.cs
deleted file mode 100644
index fb13cf1..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/TwitchSearchService.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using VDownload.Common;
-using VDownload.Common.Exceptions;
-using VDownload.Common.Models;
-using VDownload.Common.Services;
-using VDownload.Services.HttpClient;
-using VDownload.Sources.Twitch.Api;
-using VDownload.Sources.Twitch.Api.GQL.GetVideoToken.Response;
-using VDownload.Sources.Twitch.Api.Helix.GetVideos.Response;
-using VDownload.Sources.Twitch.Authentication;
-using VDownload.Sources.Twitch.Configuration;
-
-namespace VDownload.Sources.Twitch.Search
-{
-    public interface ITwitchSearchService : ISourceSearchService
-    {
-        Task<TwitchVideo> SearchVideo(string url);
-        Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount);
-    }
-
-    public class TwitchSearchService : ITwitchSearchService
-    {
-        #region SERVICES
-
-        private readonly TwitchApiHelixConfiguration _apiHelixConfiguration;
-        private readonly TwitchApiGQLConfiguration _apiGQLConfiguration;
-        private readonly TwitchSearchConfiguration _searchConfiguration;
-
-        private readonly ITwitchApiService _apiService;
-        private readonly ITwitchAuthenticationService _twitchAuthenticationService;
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public TwitchSearchService(TwitchConfiguration configuration, ITwitchApiService apiService, ITwitchAuthenticationService twitchAuthenticationService)
-        {
-            _apiHelixConfiguration = configuration.Api.Helix;
-            _apiGQLConfiguration = configuration.Api.GQL;
-            _searchConfiguration = configuration.Search;
-
-            _apiService = apiService;
-            _twitchAuthenticationService = twitchAuthenticationService;
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        async Task<Video> ISourceSearchService.SearchVideo(string url) => await SearchVideo(url);
-        public async Task<TwitchVideo> SearchVideo(string url)
-        {
-            foreach (Regex regex in _searchConfiguration.VodRegexes)
-            {
-                Match match = regex.Match(url);
-                if (match.Success)
-                {
-                    string id = match.Groups[1].Value;
-                    return await GetVod(id);
-                }
-            }
-            throw new MediaSearchException("Invalid url");
-        }
-
-        async Task<Playlist> ISourceSearchService.SearchPlaylist(string url, int maxVideoCount) => await SearchPlaylist(url, maxVideoCount);
-        public async Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-
-
-
-        #region PRIVATE METHODS
-
-        private async Task<byte[]> GetToken()
-        {
-            byte[]? token = await _twitchAuthenticationService.GetToken();
-            if (token is null)
-            {
-                throw new MediaSearchException("Not authenticated to Twitch");
-            }
-            TwitchValidationResult validation = await _twitchAuthenticationService.ValidateToken(token);
-            if (!validation.Success)
-            {
-                throw new MediaSearchException("Twitch authentication error");
-            }
-            return token;
-        }
-
-        private async Task<TwitchVod> GetVod(string id)
-        {
-            Task<IEnumerable<TwitchVodStream>> streamsTask = GetVodStreams(id);
-
-            byte[] token = await GetToken();
-            GetVideosResponse info = await _apiService.HelixGetVideos(id, token);
-            Data vodResponse = info.Data[0];
-
-            TwitchVod vod = new TwitchVod
-            {
-                Title = vodResponse.Title,
-                Description = vodResponse.Description,
-                Author = vodResponse.UserName,
-                PublishDate = vodResponse.PublishedAt,
-                Duration = ParseVodDuration(vodResponse.Duration),
-                ViewCount = vodResponse.ViewCount,
-                ThumbnailUrl = vodResponse.ThumbnailUrl.Replace("%{width}", _searchConfiguration.VodThumbnailWidth.ToString()).Replace("%{height}", _searchConfiguration.VodThumbnailHeight.ToString()),
-                Url = vodResponse.Url,
-            };
-
-            await streamsTask;
-            foreach (TwitchVodStream stream in streamsTask.Result)
-            {
-                vod.Streams.Add(stream);
-            }
-
-            return vod;
-        }
-
-        private async Task<IEnumerable<TwitchVodStream>> GetVodStreams(string id)
-        {
-            GetVideoTokenResponse videoToken = await _apiService.GQLGetVideoToken(id);
-
-            string playlist = await _apiService.UsherGetVideoPlaylist(id, videoToken.Data.VideoPlaybackAccessToken.Value, videoToken.Data.VideoPlaybackAccessToken.Signature);
-
-            MatchCollection matches = _searchConfiguration.VodStreamPlaylistRegex.Matches(playlist);
-
-            List<TwitchVodStream> streams = new List<TwitchVodStream>();
-            foreach (Match match in matches)
-            {
-                streams.Add(new TwitchVodStream
-                {
-                    StreamIdentifier = match.Groups["id"].Value,
-                    Codecs = match.Groups["codecs"].Value,
-                    Width = int.Parse(match.Groups["width"].Value),
-                    Height = int.Parse(match.Groups["height"].Value),
-                    UrlM3U8 = match.Groups["url"].Value
-                });
-            }
-            return streams;
-        }
-
-        private TimeSpan ParseVodDuration(string duration)
-        {
-            int hours = int.Parse(duration.Split('h')[0]);
-            duration = duration.Split('h')[1];
-            int minutes = int.Parse(duration.Split('m')[0]);
-            duration = duration.Split('m')[1];
-            int seconds = int.Parse(duration.Split('s')[0]);
-            return TimeSpan.FromSeconds(seconds) + TimeSpan.FromMinutes(minutes) + TimeSpan.FromHours(hours);
-        }
-
-        #endregion 
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/VDownload.Sources.Twitch.Search.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/VDownload.Sources.Twitch.Search.csproj
deleted file mode 100644
index c684fe7..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Search/VDownload.Sources.Twitch.Search.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\VDownload.Common\VDownload.Common.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch.Api\VDownload.Sources.Twitch.Api.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj" />
-    <ProjectReference Include="..\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/ChunkDownloadingError.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/ChunkDownloadingError.cs
new file mode 100644
index 0000000..ec6ed6b
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/ChunkDownloadingError.cs
@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Sources.Twitch.Settings.Models
+{
+    public class ChunkDownloadingError
+    {
+        [JsonProperty("error_retry")]
+        public bool Retry { get; set; } = true;
+
+        [JsonProperty("retries_count")]
+        public int RetriesCount { get; set; } = 10;
+
+        [JsonProperty("retry_delay")]
+        public int RetryDelay { get; set; } = 5000;
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/Vod.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/Vod.cs
new file mode 100644
index 0000000..31e7a29
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/Models/Vod.cs
@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Sources.Twitch.Settings.Models
+{
+    public class Vod
+    {
+        [JsonProperty("passive_trimming")]
+        public bool PassiveTrimming { get; set; } = true;
+
+        [JsonProperty("chunk_downloading_error")]
+        public ChunkDownloadingError ChunkDownloadingError { get; set; } = new ChunkDownloadingError();
+
+        [JsonProperty("max_number_of_parallel_downloads")]
+        public int MaxNumberOfParallelDownloads { get; set; } = 100;
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/TwitchSettings.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/TwitchSettings.cs
new file mode 100644
index 0000000..6133be4
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/TwitchSettings.cs
@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Sources.Twitch.Settings.Models;
+
+namespace VDownload.Sources.Twitch.Settings
+{
+    public class TwitchSettings
+    {
+        [JsonProperty("vod")]
+        public Vod Vod { get; set; } = new Vod();
+    }
+}
diff --git a/VDownload.Common/VDownload.Common.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/VDownload.Sources.Twitch.Settings.csproj
similarity index 76%
rename from VDownload.Common/VDownload.Common.csproj
rename to VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/VDownload.Sources.Twitch.Settings.csproj
index 725079f..3b5b170 100644
--- a/VDownload.Common/VDownload.Common.csproj
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Settings/VDownload.Sources.Twitch.Settings.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchSearchService.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchSearchService.cs
new file mode 100644
index 0000000..b0b9c04
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchSearchService.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Sources.Common;
+using VDownload.Sources.Twitch.Api;
+using VDownload.Sources.Twitch.Api.GQL.GetVideoToken.Response;
+using VDownload.Sources.Twitch.Api.Helix.GetVideos.Response;
+using VDownload.Sources.Twitch.Authentication;
+using VDownload.Sources.Twitch.Configuration.Models;
+using VDownload.Sources.Twitch.Models;
+
+namespace VDownload.Sources.Twitch
+{
+    public interface ITwitchSearchService : ISourceSearchService
+    {
+        Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount);
+        Task<TwitchVideo> SearchVideo(string url);
+    }
+
+
+
+    public class TwitchSearchService : ITwitchSearchService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ITwitchApiService _apiService;
+        protected readonly ITwitchAuthenticationService _twitchAuthenticationService;
+        protected readonly ITwitchVideoStreamFactoryService _videoStreamFactoryService;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public TwitchSearchService(IConfigurationService configurationService, ITwitchApiService apiService, ITwitchAuthenticationService authenticationService, ITwitchVideoStreamFactoryService videoStreamFactoryService)
+        {
+            _configurationService = configurationService;
+            _apiService = apiService;
+            _twitchAuthenticationService = authenticationService;
+            _videoStreamFactoryService = videoStreamFactoryService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        async Task<Video> ISourceSearchService.SearchVideo(string url) => await SearchVideo(url);
+        public async Task<TwitchVideo> SearchVideo(string url)
+        {
+            foreach (Regex regex in _configurationService.Twitch.Search.Vod.Regexes.Select(x => new Regex(x)))
+            {
+                Match match = regex.Match(url);
+                if (match.Success)
+                {
+                    string id = match.Groups[1].Value;
+                    return await GetVod(id);
+                }
+            }
+            throw new MediaSearchException("Invalid url"); // TODO : Change to string resource
+        }
+
+        async Task<Playlist> ISourceSearchService.SearchPlaylist(string url, int maxVideoCount) => await SearchPlaylist(url, maxVideoCount);
+        public async Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+
+
+        #region PRIVATE METHODS
+
+        protected async Task<TwitchVod> GetVod(string id)
+        {
+            Task<IEnumerable<TwitchVodStream>> streamsTask = GetVodStreams(id);
+
+            byte[] token = await GetToken();
+            GetVideosResponse info = await _apiService.HelixGetVideos(id, token);
+            Data vodResponse = info.Data[0];
+
+            Thumbnail thumbnail = _configurationService.Twitch.Search.Vod.Thumbnail;
+            TwitchVod vod = new TwitchVod
+            {
+                Title = vodResponse.Title,
+                Description = vodResponse.Description,
+                Author = vodResponse.UserName,
+                PublishDate = vodResponse.PublishedAt,
+                Duration = ParseVodDuration(vodResponse.Duration),
+                Views = vodResponse.ViewCount,
+                ThumbnailUrl = new Uri(vodResponse.ThumbnailUrl.Replace("%{width}", thumbnail.Width.ToString()).Replace("%{height}", thumbnail.Height.ToString())),
+                Url = new Uri(vodResponse.Url),
+            };
+
+            await streamsTask;
+            foreach (TwitchVodStream stream in streamsTask.Result)
+            {
+                vod.Streams.Add(stream);
+            }
+
+            return vod;
+        }
+
+        protected async Task<IEnumerable<TwitchVodStream>> GetVodStreams(string id)
+        {
+            GetVideoTokenResponse videoToken = await _apiService.GQLGetVideoToken(id);
+
+            string playlist = await _apiService.UsherGetVideoPlaylist(id, videoToken.Data.VideoPlaybackAccessToken.Value, videoToken.Data.VideoPlaybackAccessToken.Signature);
+
+            Regex regex = new Regex(_configurationService.Twitch.Search.Vod.StreamPlaylistRegex);
+            MatchCollection matches = regex.Matches(playlist);
+
+            List<TwitchVodStream> streams = new List<TwitchVodStream>();
+            foreach (Match match in matches)
+            {
+                TwitchVodStream stream = _videoStreamFactoryService.CreateVodStream();
+                stream.Name = match.Groups["id"].Value;
+                stream.VideoCodec = match.Groups["video_codec"].Value;
+                stream.AudioCodec = match.Groups["audio_codec"].Value;
+                stream.Width = int.Parse(match.Groups["width"].Value);
+                stream.Height = int.Parse(match.Groups["height"].Value);
+                stream.UrlM3U8 = match.Groups["url"].Value;
+                streams.Add(stream);
+            }
+            return streams;
+        }
+
+        protected TimeSpan ParseVodDuration(string duration)
+        {
+            IEnumerable<string> parts = duration.Split(['h', 'm', 's'])[..^1].Reverse();
+            string? seconds = parts.ElementAtOrDefault(0);
+            string? minutes = parts.ElementAtOrDefault(1);
+            string? hours = parts.ElementAtOrDefault(2);
+
+            TimeSpan timeSpan = TimeSpan.Zero;
+            if (!string.IsNullOrEmpty(seconds))
+            {
+                int secondsInt = int.Parse(seconds);
+                timeSpan += TimeSpan.FromSeconds(secondsInt);
+            }
+            if (!string.IsNullOrEmpty(minutes))
+            {
+                int minutesInt = int.Parse(minutes);
+                timeSpan += TimeSpan.FromMinutes(minutesInt);
+            }
+            if (!string.IsNullOrEmpty(hours))
+            {
+                int hoursInt = int.Parse(hours);
+                timeSpan += TimeSpan.FromHours(hoursInt);
+            }
+            return timeSpan;
+        }
+
+        protected async Task<byte[]> GetToken()
+        {
+            byte[]? token = await _twitchAuthenticationService.GetToken();
+            if (token is null)
+            {
+                throw new MediaSearchException("Not authenticated to Twitch"); // TODO : Change to string resource
+            }
+            TwitchValidationResult validation = await _twitchAuthenticationService.ValidateToken(token);
+            if (!validation.Success)
+            {
+                throw new MediaSearchException("Twitch authentication error"); // TODO : Change to string resource
+            }
+            return token;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideo.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideo.cs
deleted file mode 100644
index a74ed3f..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common.Models;
-
-namespace VDownload.Sources.Twitch
-{
-    public abstract class TwitchVideo : Video
-    {
-        #region CONSTRUCTORS
-
-        protected TwitchVideo() 
-        {
-            _source = Common.Source.Twitch;
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideoStreamFactoryService.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideoStreamFactoryService.cs
new file mode 100644
index 0000000..80ada97
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVideoStreamFactoryService.cs
@@ -0,0 +1,46 @@
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using VDownload.Sources.Twitch.Models;
+
+namespace VDownload.Sources.Twitch
+{
+    public interface ITwitchVideoStreamFactoryService
+    {
+        TwitchVodStream CreateVodStream();
+    }
+
+
+
+    public class TwitchVideoStreamFactoryService : ITwitchVideoStreamFactoryService
+    {
+        #region SERVICES
+
+        protected readonly HttpClient _httpClient;
+
+        protected readonly IConfigurationService _configurationService;
+        protected readonly ISettingsService _settingsService;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public TwitchVideoStreamFactoryService(HttpClient httpClient, IConfigurationService configurationService, ISettingsService settingsService)
+        {
+            _httpClient = httpClient;
+            _configurationService = configurationService;
+            _settingsService = settingsService;
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public TwitchVodStream CreateVodStream() => new TwitchVodStream(_httpClient, _configurationService, _settingsService);
+
+        #endregion
+    }
+}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVodStream.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVodStream.cs
deleted file mode 100644
index a7e2511..0000000
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchVodStream.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common;
-
-namespace VDownload.Sources.Twitch
-{
-    public partial class TwitchVodStream : VideoStream
-    {
-        #region PROPERTIES
-
-        [ObservableProperty]
-        private string _urlM3U8;
-
-        [ObservableProperty]
-        private int _height;
-
-        [ObservableProperty]
-        private int _width;
-
-        [ObservableProperty]
-        private string _codecs;
-
-        #endregion
-    }
-}
diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/VDownload.Sources.Twitch.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/VDownload.Sources.Twitch.csproj
index 7483fa6..04613bf 100644
--- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/VDownload.Sources.Twitch.csproj
+++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/VDownload.Sources.Twitch.csproj
@@ -7,11 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\VDownload.Common\VDownload.Common.csproj" />
+    <ProjectReference Include="..\..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\VDownload.Sources.Common\VDownload.Sources.Common.csproj" />
+    <ProjectReference Include="..\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj" />
+    <ProjectReference Include="..\VDownload.Sources.Twitch.Models\VDownload.Sources.Twitch.Models.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/VDownload.Services/VDownload.Services.Search/SearchService.cs b/VDownload.Sources/VDownload.Sources/SearchService.cs
similarity index 77%
rename from VDownload.Services/VDownload.Services.Search/SearchService.cs
rename to VDownload.Sources/VDownload.Sources/SearchService.cs
index 5d8c42e..2e5de93 100644
--- a/VDownload.Services/VDownload.Services.Search/SearchService.cs
+++ b/VDownload.Sources/VDownload.Sources/SearchService.cs
@@ -4,15 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using VDownload.Common;
-using VDownload.Common.Exceptions;
-using VDownload.Common.Models;
-using VDownload.Common.Services;
+using VDownload.Models;
+using VDownload.Services.Data.Configuration;
+using VDownload.Sources.Common;
 using VDownload.Sources.Twitch;
 using VDownload.Sources.Twitch.Configuration;
 using VDownload.Sources.Twitch.Search;
 
-namespace VDownload.Services.Search
+namespace VDownload.Sources
 {
     public interface ISearchService
     {
@@ -34,10 +33,12 @@ namespace VDownload.Services.Search
 
         #region CONSTRUCTORS
 
-        public SearchService(TwitchConfiguration twitchConfiguration, ITwitchSearchService twitchSearchService)
+        public SearchService(IConfigurationService configurationService, ITwitchSearchService twitchSearchService)
         {
-            _urlMappings = new List<(Regex, ISourceSearchService)>();
-            _urlMappings.AddRange(twitchConfiguration.Search.GeneralRegexes.Select(x => (x, (ISourceSearchService)twitchSearchService)));
+            _urlMappings =
+            [
+                .. configurationService.Twitch.Search.GeneralRegexes.Select(x => (new Regex(x), (ISourceSearchService)twitchSearchService)),
+            ];
         }
 
         #endregion
@@ -57,7 +58,7 @@ namespace VDownload.Services.Search
                     return await mapping.Service.SearchVideo(url);
                 }
             }
-            throw new MediaSearchException("Source is not supported");
+            throw new MediaSearchException("Source is not supported"); // TODO : Change to string resource
         }
 
         public async Task<Playlist> SearchPlaylist(string url, int maxVideoCount)
@@ -71,7 +72,7 @@ namespace VDownload.Services.Search
                     return await mapping.Service.SearchPlaylist(url, maxVideoCount);
                 }
             }
-            throw new MediaSearchException("Source is not supported");
+            throw new MediaSearchException("Source is not supported"); // TODO : Change to string resource
         }
 
         #endregion
@@ -84,7 +85,7 @@ namespace VDownload.Services.Search
         {
             if (string.IsNullOrWhiteSpace(url))
             {
-                throw new MediaSearchException("Url cannot be empty");
+                throw new MediaSearchException("Url cannot be empty"); // TODO : Change to string resource
             }
         }
 
diff --git a/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj b/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj
new file mode 100644
index 0000000..fdec61e
--- /dev/null
+++ b/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\VDownload.Sources.Common\VDownload.Sources.Common.csproj" />
+    <ProjectReference Include="..\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/VDownload.Tasks/DownloadTask.cs b/VDownload.Tasks/DownloadTask.cs
deleted file mode 100644
index 4fa8108..0000000
--- a/VDownload.Tasks/DownloadTask.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.UI.Dispatching;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using VDownload.Common;
-using VDownload.Common.Models;
-
-namespace VDownload.Tasks
-{
-    public partial class DownloadTask : ObservableObject
-    {
-        #region FIELDS
-
-        private CancellationTokenSource? _cancellationTokenSource;
-
-        private Task _downloadTask;
-
-        private DispatcherQueue _dispatcherQueue;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        [ObservableProperty]
-        private Video _video;
-
-        [ObservableProperty]
-        private VideoStream _videoStream;
-
-        [ObservableProperty]
-        private MediaType _mediaType;
-
-        [ObservableProperty]
-        private TimeSpan _trimStart;
-
-        [ObservableProperty]
-        private TimeSpan _trimEnd;
-
-        [ObservableProperty]
-        private string _directoryPath;
-
-        [ObservableProperty]
-        private string _filename;
-
-        [ObservableProperty]
-        private VideoExtension _videoExtension;
-
-        [ObservableProperty]
-        private AudioExtension _audioExtension;
-
-        [ObservableProperty]
-        private DownloadTaskStatus _status;
-
-        [ObservableProperty]
-        private DateTime _createDate;
-
-        [ObservableProperty]
-        private double _progress;
-
-        public TimeSpan DurationAfterTrim
-        {
-            get => _durationAfterTrim;
-            protected set => SetProperty(ref _durationAfterTrim, value);
-        }
-        protected TimeSpan _durationAfterTrim;
-
-        public bool IsTrimmed
-        {
-            get => _isTrimmed;
-            protected set => SetProperty(ref _isTrimmed, value);
-        }
-        protected bool _isTrimmed;
-
-        public string FilePath
-        {
-            get => _filePath;
-            protected set => SetProperty(ref _filePath, value);
-        }
-        protected string _filePath;
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public DownloadTask(Video video)
-        {
-            base.PropertyChanged += PropertyChanged;
-
-            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-
-            _video = video;
-            _videoStream = _video.Streams[0];
-            _mediaType = MediaType.Original; // TODO: get from settings
-            _trimStart = TimeSpan.Zero;
-            _trimEnd = _video.Duration;
-            _directoryPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory); // TODO: get from settings
-            _filename = _video.Title.Length > 50 ? _video.Title.Substring(0, 50) : _video.Title;
-            _videoExtension = VideoExtension.MP4; // TODO: get from settings
-            _audioExtension = AudioExtension.MP3; // TODO: get from settings
-            _status = DownloadTaskStatus.Idle;
-            _createDate = DateTime.Now;
-            _progress = 0;
-            _durationAfterTrim = _video.Duration;
-            _isTrimmed = false;
-            _filePath = $"{DirectoryPath}/{Filename}.{((object)(MediaType == MediaType.OnlyAudio ? AudioExtension : VideoExtension)).ToString().ToLower()}";
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        public void Enqueue()
-        {
-            DownloadTaskStatus[] statuses = 
-            [
-                DownloadTaskStatus.Idle,
-                DownloadTaskStatus.EndedUnsuccessfully,
-                DownloadTaskStatus.EndedSuccessfully,
-                DownloadTaskStatus.EndedCancelled,
-            ];
-            if (statuses.Contains(Status))
-            {
-                Status = DownloadTaskStatus.Queued;
-            }
-        }
-
-        public void Start()
-        {
-            _cancellationTokenSource = new CancellationTokenSource();
-
-            UpdateStatusWithDispatcher(DownloadTaskStatus.Initializing);
-
-            _downloadTask = Task.Run(Download);
-        }
-
-        public void Cancel()
-        {
-            if (_cancellationTokenSource is not null)
-            {
-                _cancellationTokenSource.Cancel();
-                _cancellationTokenSource = null;
-            }
-        }
-
-        #endregion
-
-
-
-        #region PRIVATE METHODS
-
-        private void Download()
-        {
-            CancellationToken token = _cancellationTokenSource.Token;
-        }
-
-        private void UpdateStatusWithDispatcher(DownloadTaskStatus status)
-        {
-            _dispatcherQueue.TryEnqueue(() => Status = status);
-        }
-
-        #endregion
-
-
-
-        #region EVENT HANDLERS
-
-        private void PropertyChanged(object? sender, PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case nameof(Filename):
-                case nameof(DirectoryPath):
-                case nameof(VideoExtension):
-                case nameof(AudioExtension):
-                    FilePath = $"{DirectoryPath}/{Filename}.{((object)(MediaType == MediaType.OnlyAudio ? AudioExtension : VideoExtension)).ToString().ToLower()}";
-                    break;
-                case nameof(TrimStart):
-                case nameof(TrimEnd): 
-                    DurationAfterTrim = TrimEnd.Subtract(TrimStart);
-                    break;
-                case nameof(DurationAfterTrim):
-                    IsTrimmed = DurationAfterTrim != Video.Duration;
-                    break;
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Tasks/DownloadTasksManager.cs b/VDownload.Tasks/DownloadTasksManager.cs
deleted file mode 100644
index 54fbb2f..0000000
--- a/VDownload.Tasks/DownloadTasksManager.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VDownload.Common;
-
-namespace VDownload.Tasks
-{ 
-    public interface IDownloadTasksManager
-    {
-        #region PROPERTIES
-
-        ObservableCollection<DownloadTask> Tasks { get; }
-
-        #endregion
-
-
-
-        #region METHODS
-
-        void AddTask(DownloadTask task);
-
-        #endregion
-    }
-
-
-
-    public class DownloadTasksManager : IDownloadTasksManager
-    {
-        #region FIELDS
-
-        private readonly Task _taskMonitor;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        public ObservableCollection<DownloadTask> Tasks { get; protected set; }
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public DownloadTasksManager()
-        {
-            Tasks = new ObservableCollection<DownloadTask>();
-
-            _taskMonitor = Task.Run(TaskMonitor);
-        }
-
-        #endregion
-
-
-
-        #region PUBLIC METHODS
-
-        public void AddTask(DownloadTask task)
-        {
-            Tasks.Add(task);
-        }
-
-        #endregion
-
-
-
-        #region PRIVATE METHODS
-
-        private void TaskMonitor()
-        {
-            int maxTaskNumber = 5; //TODO: from settings
-            DownloadTaskStatus[] pendingStatuses =
-            [
-                DownloadTaskStatus.Initializing,
-                DownloadTaskStatus.Downloading,
-                DownloadTaskStatus.Processing,
-                DownloadTaskStatus.Finalizing
-            ];
-            while (true)
-            {
-                IEnumerable<DownloadTask> pendingTasks = Tasks.Where(x => pendingStatuses.Contains(x.Status));
-                int freeSlots = maxTaskNumber - pendingTasks.Count();
-                if (freeSlots > 0)
-                {
-                    IEnumerable<DownloadTask> queuedTasks = Tasks.Where(x => x.Status == DownloadTaskStatus.Queued).OrderBy(x => x.CreateDate).Take(freeSlots);
-                    foreach (DownloadTask queuedTask in queuedTasks)
-                    {
-                        queuedTask.Start();
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Extensions/StringExtensions.cs b/VDownload.Toolkit/VDownload.Toolkit.Extensions/StringExtensions.cs
similarity index 76%
rename from VDownload.Extensions/StringExtensions.cs
rename to VDownload.Toolkit/VDownload.Toolkit.Extensions/StringExtensions.cs
index d65034b..2f57986 100644
--- a/VDownload.Extensions/StringExtensions.cs
+++ b/VDownload.Toolkit/VDownload.Toolkit.Extensions/StringExtensions.cs
@@ -1,19 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Extensions
+namespace VDownload.Toolkit.Extensions
 {
     public static class StringExtensions
     {
+        #region STATIC
+
         public static string CreateRandom(int length) => CreateRandom(length, "QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890`~!@#$%^&*()-_=+[{]};:'\"\\|,<.>/?");
         public static string CreateRandom(int length, IEnumerable<char> characters) => new string(Enumerable.Repeat(characters, length).Select(s => s.ElementAt(Random.Shared.Next(s.Count()))).ToArray());
 
-        public static string Shuffle(this string str)
+        #endregion
+
+
+
+        #region INSTANCE
+
+        public static string Shuffle(this string instance)
         {
-            char[] array = str.ToCharArray();
+            char[] array = instance.ToCharArray();
             Random rng = Random.Shared;
             int n = array.Length;
             while (n > 1)
@@ -26,5 +28,7 @@ namespace VDownload.Extensions
             }
             return new string(array);
         }
+
+        #endregion
     }
 }
diff --git a/VDownload.Services/VDownload.Services/VDownload.Services.csproj b/VDownload.Toolkit/VDownload.Toolkit.Extensions/VDownload.Toolkit.Extensions.csproj
similarity index 100%
rename from VDownload.Services/VDownload.Services/VDownload.Services.csproj
rename to VDownload.Toolkit/VDownload.Toolkit.Extensions/VDownload.Toolkit.Extensions.csproj
diff --git a/VDownload.GUI/VDownload.GUI.Customs/Behaviors/EventToCommandBehavior.cs b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/EventToCommandBehavior.cs
similarity index 98%
rename from VDownload.GUI/VDownload.GUI.Customs/Behaviors/EventToCommandBehavior.cs
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/EventToCommandBehavior.cs
index 310eab5..19e89b7 100644
--- a/VDownload.GUI/VDownload.GUI.Customs/Behaviors/EventToCommandBehavior.cs
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/EventToCommandBehavior.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace VDownload.GUI.Customs.Behaviors
+namespace VDownload.Toolkit.UI.Behaviors
 {
     public class EventToCommandBehavior : Behavior<FrameworkElement>
     {
diff --git a/VDownload.GUI/VDownload.GUI.Customs/VDownload.GUI.Customs.csproj b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/VDownload.Toolkit.UI.Behaviors.csproj
similarity index 88%
rename from VDownload.GUI/VDownload.GUI.Customs/VDownload.GUI.Customs.csproj
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/VDownload.Toolkit.UI.Behaviors.csproj
index a8938f7..8e6ed06 100644
--- a/VDownload.GUI/VDownload.GUI.Customs/VDownload.GUI.Customs.csproj
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Behaviors/VDownload.Toolkit.UI.Behaviors.csproj
@@ -2,14 +2,14 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Customs</RootNamespace>
+    <RootNamespace>VDownload.Toolkit.UI.Behaviors</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
       <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
   </ItemGroup>
diff --git a/VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml
similarity index 91%
rename from VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml
index 92ca9e3..87b369b 100644
--- a/VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
-    x:Class="VDownload.GUI.Controls.TimeSpanControl"
+    x:Class="VDownload.Toolkit.UI.Controls.TimeSpanControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.GUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
diff --git a/VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml.cs b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml.cs
similarity index 95%
rename from VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml.cs
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml.cs
index f076667..8f03899 100644
--- a/VDownload.GUI/VDownload.GUI.Controls/TimeSpanControl.xaml.cs
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/TimeSpanControl.xaml.cs
@@ -13,10 +13,7 @@ using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace VDownload.GUI.Controls
+namespace VDownload.Toolkit.UI.Controls
 {
     public sealed partial class TimeSpanControl : UserControl
     {
diff --git a/VDownload.GUI/VDownload.GUI.Controls/VDownload.GUI.Controls.csproj b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/VDownload.Toolkit.UI.Controls.csproj
similarity index 74%
rename from VDownload.GUI/VDownload.GUI.Controls/VDownload.GUI.Controls.csproj
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/VDownload.Toolkit.UI.Controls.csproj
index cac5510..38e0f48 100644
--- a/VDownload.GUI/VDownload.GUI.Controls/VDownload.GUI.Controls.csproj
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Controls/VDownload.Toolkit.UI.Controls.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Controls</RootNamespace>
+    <RootNamespace>VDownload.Toolkit.UI.Controls</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <UseRidGraph>true</UseRidGraph>
@@ -12,15 +12,13 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 
   <ItemGroup>
-    <CustomAdditionalCompileInputs Remove="TimeSpanControl.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Remove="TimeSpanControl.xaml" />
+    <Page Update="TimeSpanControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
 </Project>
diff --git a/VDownload.GUI/VDownload.GUI.Converters/EnumToIntConverter.cs b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToIntConverter.cs
similarity index 83%
rename from VDownload.GUI/VDownload.GUI.Converters/EnumToIntConverter.cs
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToIntConverter.cs
index 574f131..aaae8fa 100644
--- a/VDownload.GUI/VDownload.GUI.Converters/EnumToIntConverter.cs
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToIntConverter.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Converters
+namespace VDownload.Toolkit.UI.Converters
 {
-    public class EnumToIntConverter : IValueConverter
+    public class ObjectToIntConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/VDownload.GUI/VDownload.GUI.Converters/EnumToStringConverter.cs b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToStringConverter.cs
similarity index 54%
rename from VDownload.GUI/VDownload.GUI.Converters/EnumToStringConverter.cs
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToStringConverter.cs
index 4d8b230..f9741a6 100644
--- a/VDownload.GUI/VDownload.GUI.Converters/EnumToStringConverter.cs
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/ObjectToStringConverter.cs
@@ -5,21 +5,15 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VDownload.GUI.Converters
+namespace VDownload.Toolkit.UI.Converters
 {
-    public class EnumToStringConverter : IValueConverter
+    public class ObjectToStringConverter : IValueConverter
     {
         #region METHODS
 
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            return value.ToString();
-        }
+        public object Convert(object value, Type targetType, object parameter, string language) => value.ToString();
 
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
 
         #endregion
     }
diff --git a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/VDownload.GUI.Services.Dialog.csproj b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/VDownload.Toolkit.UI.Converters.csproj
similarity index 86%
rename from VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/VDownload.GUI.Services.Dialog.csproj
rename to VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/VDownload.Toolkit.UI.Converters.csproj
index 00aab80..9f85efb 100644
--- a/VDownload.GUI/VDownload.GUI.Services/VDownload.GUI.Services.Dialog/VDownload.GUI.Services.Dialog.csproj
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Converters/VDownload.Toolkit.UI.Converters.csproj
@@ -2,14 +2,14 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>VDownload.GUI.Services.Dialog</RootNamespace>
+    <RootNamespace>VDownload.Toolkit.UI.Converters</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 </Project>
diff --git a/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/NavigationViewItem.cs b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/NavigationViewItem.cs
new file mode 100644
index 0000000..b212d03
--- /dev/null
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/NavigationViewItem.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Toolkit.UI.Models
+{
+    public class NavigationViewItem
+    {
+        #region PROPERTIES
+
+        public string Name { get; set; }
+        public string IconSource { get; set; }
+        public Type ViewModel { get; set; }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/VDownload.Toolkit.UI.Models.csproj b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/VDownload.Toolkit.UI.Models.csproj
new file mode 100644
index 0000000..fa71b7a
--- /dev/null
+++ b/VDownload.Toolkit/VDownload.Toolkit.UI/VDownload.Toolkit.UI.Models/VDownload.Toolkit.UI.Models.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/VDownload.sln b/VDownload.sln
index 103d6f5..4cdb453 100644
--- a/VDownload.sln
+++ b/VDownload.sln
@@ -3,61 +3,85 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload", "VDownload\VDownload.csproj", "{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload", "VDownload\VDownload.csproj", "{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Sources", "VDownload.Sources", "{544D2AC1-40DA-478C-953F-33B28B231D65}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Toolkit", "VDownload.Toolkit", "{5881405B-CA88-4A10-A8AC-1822249AC0FA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.GUI", "VDownload.GUI", "{F96D1D3B-430F-4012-A27B-E78B58D0814A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Toolkit.UI", "VDownload.Toolkit.UI", "{2DABFD88-246F-47C2-B752-24DCF7477CEC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Views", "VDownload.GUI\VDownload.GUI.Views\VDownload.GUI.Views.csproj", "{B5F04E8E-1265-49A7-991B-D78E245DE205}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Toolkit.UI.Controls", "VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Controls\VDownload.Toolkit.UI.Controls.csproj", "{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.GUI.Services", "VDownload.GUI.Services", "{041BC663-561E-4F06-BE64-9726BCB51489}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Toolkit.UI.Converters", "VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Converters\VDownload.Toolkit.UI.Converters.csproj", "{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Converters", "VDownload.GUI\VDownload.GUI.Converters\VDownload.GUI.Converters.csproj", "{58869C3F-A480-402C-B65C-A1066589CAFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Toolkit.UI.Behaviors", "VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Behaviors\VDownload.Toolkit.UI.Behaviors.csproj", "{5DB5CE22-96F4-4789-8A48-4F3C164A5972}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Customs", "VDownload.GUI\VDownload.GUI.Customs\VDownload.GUI.Customs.csproj", "{3311D184-92F8-4D31-80EB-D703D2F23CA9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Toolkit.Extensions", "VDownload.Toolkit\VDownload.Toolkit.Extensions\VDownload.Toolkit.Extensions.csproj", "{8091445A-2CAB-43A4-9459-745974D69834}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Services", "VDownload.Services", "{9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Sources", "VDownload.Sources", "{9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Search", "VDownload.Services\VDownload.Services.Search\VDownload.Services.Search.csproj", "{843CADF6-A394-4729-80CC-009E6E9B83C2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Sources.Twitch", "VDownload.Sources.Twitch", "{8D94F264-4EE9-4C24-AB77-2CCA36858309}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Common", "VDownload.Common\VDownload.Common.csproj", "{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Services", "VDownload.Services", "{8D351DB0-74E6-4C1E-A123-34D6BBBD5585}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Services.WebView", "VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.WebView\VDownload.GUI.Services.WebView.csproj", "{43E34D39-251B-4F08-8775-14781C29FFBC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Services.UI", "VDownload.Services.UI", "{4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.ViewModels", "VDownload.GUI\VDownload.GUI.ViewModels\VDownload.GUI.ViewModels.csproj", "{8177D42F-7F6F-428A-955C-768E103DA7FC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Services.Data", "VDownload.Services.Data", "{05A45688-7EEF-4656-818A-2477625C3707}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Controls", "VDownload.GUI\VDownload.GUI.Controls\VDownload.GUI.Controls.csproj", "{2197A751-741D-4CC1-8342-C99560C1253C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Services.Utility", "VDownload.Services.Utility", "{1020167A-4101-496E-82CF-41B65769DD28}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Services.ResourceDictionaries", "VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.ResourceDictionaries\VDownload.GUI.Services.ResourceDictionaries.csproj", "{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.Authentication", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Authentication\VDownload.Services.Data.Authentication.csproj", "{FB21E094-B723-4E7F-B7CB-434BF19B66E1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Authentication", "VDownload.Services\VDownload.Services.Authentication\VDownload.Services.Authentication.csproj", "{0838704C-7EB2-460B-9631-DBD5981ED4F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.Configuration", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj", "{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Extensions", "VDownload.Extensions\VDownload.Extensions.csproj", "{398B2437-F6C7-4434-B2A3-72DD24C2C68D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.Settings", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj", "{064C9E03-87C2-4C3C-B228-5C1EE93C719F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Encryption", "VDownload.Services\VDownload.Services.Encryption\VDownload.Services.Encryption.csproj", "{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.Notifications", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Notifications\VDownload.Services.UI.Notifications.csproj", "{A561A492-6BA3-42B1-9881-14D844C499FB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Sources.Twitch", "VDownload.Sources.Twitch", "{DF04BB29-BEBC-407B-BC52-5F663299E730}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.Dialogs", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Dialogs\VDownload.Services.UI.Dialogs.csproj", "{755DC010-214D-4975-8AAA-6B48CF367935}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj", "{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.StoragePicker", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StoragePicker\VDownload.Services.UI.StoragePicker.csproj", "{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Authentication", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj", "{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.WebView", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.WebView\VDownload.Services.UI.WebView.csproj", "{B9307732-16BB-4289-9D92-E69FEF36C052}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.HttpClient", "VDownload.Services\VDownload.Services.HttpClient\VDownload.Services.HttpClient.csproj", "{81AF8367-05F5-47AE-9C98-DFD337170C28}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Utility.HttpClient", "VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.HttpClient\VDownload.Services.Utility.HttpClient.csproj", "{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Services.Dialog", "VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.Dialog\VDownload.GUI.Services.Dialog.csproj", "{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Utility.Encryption", "VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.Encryption\VDownload.Services.Utility.Encryption.csproj", "{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Search", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Search\VDownload.Sources.Twitch.Search.csproj", "{72829E22-9202-475C-8679-C68D558E765C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj", "{9C76F18C-0689-4CE1-A426-EFCBC606D606}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Configuration", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Configuration\VDownload.Sources.Twitch.Configuration.csproj", "{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Configuration", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Configuration\VDownload.Sources.Twitch.Configuration.csproj", "{25637E29-4A69-4E36-B99B-33454506AD14}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Api", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Api\VDownload.Sources.Twitch.Api.csproj", "{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Authentication", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj", "{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services", "VDownload.Services\VDownload.Services\VDownload.Services.csproj", "{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Api", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Api\VDownload.Sources.Twitch.Api.csproj", "{5FA027FC-9973-4331-85F8-A3893823E73C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.GUI.Services.StoragePicker", "VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.StoragePicker\VDownload.GUI.Services.StoragePicker.csproj", "{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Models", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Models\VDownload.Sources.Twitch.Models.csproj", "{711FA7BE-27DA-425D-9777-967F6E519CFF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Tasks", "VDownload.Tasks\VDownload.Tasks.csproj", "{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Common", "VDownload.Sources\VDownload.Sources.Common\VDownload.Sources.Common.csproj", "{8E850249-E79D-40E7-B02D-393632DF8B8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources", "VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj", "{64A217AE-4E95-468E-85C3-67C27D689FF4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Core", "VDownload.Core", "{8539067C-9968-4AEB-928C-FEDC43989A79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Models", "VDownload.Models\VDownload.Models.csproj", "{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.StringResources", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj", "{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.DictionaryResources", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.DictionaryResources\VDownload.Services.UI.DictionaryResources.csproj", "{8DC55331-B9F3-4811-8474-348662963260}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Toolkit.UI.Models", "VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Models\VDownload.Toolkit.UI.Models.csproj", "{C3C44E06-E03A-4971-99DA-06F6AD606B3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Settings", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Settings\VDownload.Sources.Twitch.Settings.csproj", "{A726FD43-B111-423B-BAF6-D65B4C0E37B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Core.Strings", "VDownload.Core\VDownload.Core.Strings\VDownload.Core.Strings.csproj", "{E1D4352C-51AC-4572-8515-0B4E89A2442F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Core.ViewModels", "VDownload.Core\VDownload.Core.ViewModels\VDownload.Core.ViewModels.csproj", "{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Core.Views", "VDownload.Core\VDownload.Core.Views\VDownload.Core.Views.csproj", "{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VDownload.Core.Tasks", "VDownload.Core\VDownload.Core.Tasks\VDownload.Core.Tasks.csproj", "{3BE998A3-1126-4496-BF60-80D0CEA4D24F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VDownload.Services.Utility.FFmpeg", "VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.FFmpeg\VDownload.Services.Utility.FFmpeg.csproj", "{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,410 +95,549 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|Any CPU.Build.0 = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x64.ActiveCfg = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x64.Build.0 = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x64.Deploy.0 = Debug|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x86.ActiveCfg = Debug|x86
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x86.Build.0 = Debug|x86
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Debug|x86.Deploy.0 = Debug|x86
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|Any CPU.ActiveCfg = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|Any CPU.Build.0 = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|Any CPU.Deploy.0 = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|ARM64.Build.0 = Release|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|ARM64.Deploy.0 = Release|ARM64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x64.ActiveCfg = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x64.Build.0 = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x64.Deploy.0 = Release|x64
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x86.ActiveCfg = Release|x86
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x86.Build.0 = Release|x86
-		{2E870B51-B1CC-4D80-BAC6-E06F5C8328E5}.Release|x86.Deploy.0 = Release|x86
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|x64.Build.0 = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Debug|x86.Build.0 = Debug|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|ARM64.Build.0 = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|x64.ActiveCfg = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|x64.Build.0 = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|x86.ActiveCfg = Release|Any CPU
-		{B5F04E8E-1265-49A7-991B-D78E245DE205}.Release|x86.Build.0 = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Debug|x86.Build.0 = Debug|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|ARM64.Build.0 = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|x64.Build.0 = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{58869C3F-A480-402C-B65C-A1066589CAFF}.Release|x86.Build.0 = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|x64.Build.0 = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Debug|x86.Build.0 = Debug|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|ARM64.Build.0 = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|x64.ActiveCfg = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|x64.Build.0 = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|x86.ActiveCfg = Release|Any CPU
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9}.Release|x86.Build.0 = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|x64.Build.0 = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Debug|x86.Build.0 = Debug|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|ARM64.Build.0 = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|x64.ActiveCfg = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|x64.Build.0 = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|x86.ActiveCfg = Release|Any CPU
-		{843CADF6-A394-4729-80CC-009E6E9B83C2}.Release|x86.Build.0 = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|x64.Build.0 = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Debug|x86.Build.0 = Debug|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|ARM64.Build.0 = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|x64.ActiveCfg = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|x64.Build.0 = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|x86.ActiveCfg = Release|Any CPU
-		{E65EEB63-6852-4E06-90A8-7D74BEFF4D66}.Release|x86.Build.0 = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|x64.Build.0 = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Debug|x86.Build.0 = Debug|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|ARM64.Build.0 = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|x64.ActiveCfg = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|x64.Build.0 = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{43E34D39-251B-4F08-8775-14781C29FFBC}.Release|x86.Build.0 = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|x64.Build.0 = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Debug|x86.Build.0 = Debug|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|ARM64.Build.0 = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|x64.ActiveCfg = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|x64.Build.0 = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{8177D42F-7F6F-428A-955C-768E103DA7FC}.Release|x86.Build.0 = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|x64.Build.0 = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Debug|x86.Build.0 = Debug|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|ARM64.Build.0 = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|x64.ActiveCfg = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|x64.Build.0 = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|x86.ActiveCfg = Release|Any CPU
-		{2197A751-741D-4CC1-8342-C99560C1253C}.Release|x86.Build.0 = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|x64.Build.0 = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Debug|x86.Build.0 = Debug|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|ARM64.Build.0 = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|x64.ActiveCfg = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|x64.Build.0 = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|x86.ActiveCfg = Release|Any CPU
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614}.Release|x86.Build.0 = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Debug|x86.Build.0 = Debug|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|ARM64.Build.0 = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|x64.Build.0 = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|x86.ActiveCfg = Release|Any CPU
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1}.Release|x86.Build.0 = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|x64.Build.0 = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Debug|x86.Build.0 = Debug|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|ARM64.Build.0 = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|x64.ActiveCfg = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|x64.Build.0 = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|x86.ActiveCfg = Release|Any CPU
-		{398B2437-F6C7-4434-B2A3-72DD24C2C68D}.Release|x86.Build.0 = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Debug|x86.Build.0 = Debug|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|ARM64.Build.0 = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|x64.Build.0 = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0}.Release|x86.Build.0 = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|ARM64.Build.0 = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|x64.Build.0 = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF}.Release|x86.Build.0 = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Debug|x86.Build.0 = Debug|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|ARM64.Build.0 = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|x64.Build.0 = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269}.Release|x86.Build.0 = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|x64.Build.0 = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Debug|x86.Build.0 = Debug|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|ARM64.Build.0 = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|x64.ActiveCfg = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|x64.Build.0 = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|x86.ActiveCfg = Release|Any CPU
-		{81AF8367-05F5-47AE-9C98-DFD337170C28}.Release|x86.Build.0 = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|ARM64.Build.0 = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|x64.Build.0 = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4}.Release|x86.Build.0 = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|x64.Build.0 = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Debug|x86.Build.0 = Debug|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|ARM64.Build.0 = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|x64.ActiveCfg = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|x64.Build.0 = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|x86.ActiveCfg = Release|Any CPU
-		{72829E22-9202-475C-8679-C68D558E765C}.Release|x86.Build.0 = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|ARM64.Build.0 = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|x64.Build.0 = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C}.Release|x86.Build.0 = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|x64.Build.0 = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Debug|x86.Build.0 = Debug|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|ARM64.Build.0 = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|x64.ActiveCfg = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|x64.Build.0 = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|x86.ActiveCfg = Release|Any CPU
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE}.Release|x86.Build.0 = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|ARM64.Build.0 = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|x64.Build.0 = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F}.Release|x86.Build.0 = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|ARM64.Build.0 = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|x64.Build.0 = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A}.Release|x86.Build.0 = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Debug|x86.Build.0 = Debug|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|ARM64.Build.0 = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|x64.Build.0 = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{8F2ED21C-FBFF-46AF-BA0D-23A4E88040EE}.Release|x86.Build.0 = Release|Any CPU
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|Any CPU.Build.0 = Debug|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|ARM64.Build.0 = Debug|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x64.ActiveCfg = Debug|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x64.Build.0 = Debug|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x64.Deploy.0 = Debug|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x86.ActiveCfg = Debug|x86
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x86.Build.0 = Debug|x86
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Debug|x86.Deploy.0 = Debug|x86
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|Any CPU.ActiveCfg = Release|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|Any CPU.Build.0 = Release|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|ARM64.ActiveCfg = Release|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|ARM64.Build.0 = Release|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|ARM64.Deploy.0 = Release|ARM64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x64.ActiveCfg = Release|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x64.Build.0 = Release|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x64.Deploy.0 = Release|x64
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x86.ActiveCfg = Release|x86
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x86.Build.0 = Release|x86
+		{62A8EAD3-6D6A-40FC-9E1E-C57C02E27244}.Release|x86.Deploy.0 = Release|x86
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|x64.Build.0 = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Debug|x86.Build.0 = Debug|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|ARM64.Build.0 = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|x64.ActiveCfg = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|x64.Build.0 = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|x86.ActiveCfg = Release|Any CPU
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74}.Release|x86.Build.0 = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Debug|x86.Build.0 = Debug|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|ARM64.Build.0 = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|x64.Build.0 = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D}.Release|x86.Build.0 = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|x64.Build.0 = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Debug|x86.Build.0 = Debug|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|ARM64.Build.0 = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|x64.ActiveCfg = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|x64.Build.0 = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972}.Release|x86.Build.0 = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|x64.Build.0 = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Debug|x86.Build.0 = Debug|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|ARM64.Build.0 = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|x64.ActiveCfg = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|x64.Build.0 = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|x86.ActiveCfg = Release|Any CPU
+		{8091445A-2CAB-43A4-9459-745974D69834}.Release|x86.Build.0 = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|ARM64.Build.0 = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|x64.Build.0 = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1}.Release|x86.Build.0 = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|ARM64.Build.0 = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|x64.Build.0 = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91}.Release|x86.Build.0 = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|x64.Build.0 = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Debug|x86.Build.0 = Debug|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|ARM64.Build.0 = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|x64.ActiveCfg = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|x64.Build.0 = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|x86.ActiveCfg = Release|Any CPU
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F}.Release|x86.Build.0 = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|x64.Build.0 = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Debug|x86.Build.0 = Debug|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|ARM64.Build.0 = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|x64.ActiveCfg = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|x64.Build.0 = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|x86.ActiveCfg = Release|Any CPU
+		{A561A492-6BA3-42B1-9881-14D844C499FB}.Release|x86.Build.0 = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|x64.Build.0 = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Debug|x86.Build.0 = Debug|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|Any CPU.Build.0 = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|ARM64.Build.0 = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|x64.ActiveCfg = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|x64.Build.0 = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|x86.ActiveCfg = Release|Any CPU
+		{755DC010-214D-4975-8AAA-6B48CF367935}.Release|x86.Build.0 = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|x64.Build.0 = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Debug|x86.Build.0 = Debug|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|ARM64.Build.0 = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|x64.ActiveCfg = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|x64.Build.0 = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|x86.ActiveCfg = Release|Any CPU
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87}.Release|x86.Build.0 = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Debug|x86.Build.0 = Debug|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|ARM64.Build.0 = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|x64.Build.0 = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9307732-16BB-4289-9D92-E69FEF36C052}.Release|x86.Build.0 = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|x64.Build.0 = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Debug|x86.Build.0 = Debug|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|ARM64.Build.0 = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|x64.ActiveCfg = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|x64.Build.0 = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|x86.ActiveCfg = Release|Any CPU
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615}.Release|x86.Build.0 = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|ARM64.Build.0 = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|x64.Build.0 = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0}.Release|x86.Build.0 = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|ARM64.Build.0 = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|x64.Build.0 = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606}.Release|x86.Build.0 = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|x64.Build.0 = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Debug|x86.Build.0 = Debug|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|ARM64.Build.0 = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|x64.ActiveCfg = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|x64.Build.0 = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|x86.ActiveCfg = Release|Any CPU
+		{25637E29-4A69-4E36-B99B-33454506AD14}.Release|x86.Build.0 = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|x64.Build.0 = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Debug|x86.Build.0 = Debug|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|ARM64.Build.0 = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|x64.ActiveCfg = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|x64.Build.0 = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|x86.ActiveCfg = Release|Any CPU
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C}.Release|x86.Build.0 = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|ARM64.Build.0 = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|x64.Build.0 = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FA027FC-9973-4331-85F8-A3893823E73C}.Release|x86.Build.0 = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|ARM64.Build.0 = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|x64.Build.0 = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{711FA7BE-27DA-425D-9777-967F6E519CFF}.Release|x86.Build.0 = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|ARM64.Build.0 = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|x64.Build.0 = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E850249-E79D-40E7-B02D-393632DF8B8E}.Release|x86.Build.0 = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|x64.Build.0 = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Debug|x86.Build.0 = Debug|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|ARM64.Build.0 = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|x64.ActiveCfg = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|x64.Build.0 = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|x86.ActiveCfg = Release|Any CPU
+		{64A217AE-4E95-468E-85C3-67C27D689FF4}.Release|x86.Build.0 = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|x64.Build.0 = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Debug|x86.Build.0 = Debug|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|ARM64.Build.0 = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x64.ActiveCfg = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x64.Build.0 = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x86.ActiveCfg = Release|Any CPU
+		{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x86.Build.0 = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x86.Build.0 = Debug|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|ARM64.Build.0 = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x64.Build.0 = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x86.Build.0 = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|x64.Build.0 = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Debug|x86.Build.0 = Debug|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|ARM64.Build.0 = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|x64.ActiveCfg = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|x64.Build.0 = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|x86.ActiveCfg = Release|Any CPU
+		{8DC55331-B9F3-4811-8474-348662963260}.Release|x86.Build.0 = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|x64.Build.0 = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|ARM64.Build.0 = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|x64.ActiveCfg = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|x64.Build.0 = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B}.Release|x86.Build.0 = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|ARM64.Build.0 = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|x64.Build.0 = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5}.Release|x86.Build.0 = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|x64.Build.0 = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Debug|x86.Build.0 = Debug|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|ARM64.Build.0 = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|x64.ActiveCfg = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|x64.Build.0 = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F}.Release|x86.Build.0 = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Debug|x86.Build.0 = Debug|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|ARM64.Build.0 = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|x64.Build.0 = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|x86.ActiveCfg = Release|Any CPU
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC}.Release|x86.Build.0 = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|x64.Build.0 = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Debug|x86.Build.0 = Debug|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|ARM64.Build.0 = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|x64.ActiveCfg = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|x64.Build.0 = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|x86.ActiveCfg = Release|Any CPU
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80}.Release|x86.Build.0 = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|x64.Build.0 = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Debug|x86.Build.0 = Debug|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|ARM64.Build.0 = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|x64.ActiveCfg = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|x64.Build.0 = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|x86.ActiveCfg = Release|Any CPU
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F}.Release|x86.Build.0 = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|ARM64.Build.0 = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|x64.Build.0 = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B5F04E8E-1265-49A7-991B-D78E245DE205} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{041BC663-561E-4F06-BE64-9726BCB51489} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{58869C3F-A480-402C-B65C-A1066589CAFF} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{3311D184-92F8-4D31-80EB-D703D2F23CA9} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{843CADF6-A394-4729-80CC-009E6E9B83C2} = {9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}
-		{43E34D39-251B-4F08-8775-14781C29FFBC} = {041BC663-561E-4F06-BE64-9726BCB51489}
-		{8177D42F-7F6F-428A-955C-768E103DA7FC} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{2197A751-741D-4CC1-8342-C99560C1253C} = {F96D1D3B-430F-4012-A27B-E78B58D0814A}
-		{1ABDFD57-EEAE-419A-83B9-B5020B3A7614} = {041BC663-561E-4F06-BE64-9726BCB51489}
-		{0838704C-7EB2-460B-9631-DBD5981ED4F1} = {9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}
-		{32F0AB18-7AAA-46EA-9CED-BEE6DBB2D4F0} = {9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}
-		{DF04BB29-BEBC-407B-BC52-5F663299E730} = {544D2AC1-40DA-478C-953F-33B28B231D65}
-		{AA3DCCE4-352A-46F0-921E-5AEF16F970BF} = {DF04BB29-BEBC-407B-BC52-5F663299E730}
-		{E2AFCC65-8C3C-4A84-87FE-83EE90CF1269} = {DF04BB29-BEBC-407B-BC52-5F663299E730}
-		{81AF8367-05F5-47AE-9C98-DFD337170C28} = {9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}
-		{3F8DC717-CA8E-479F-A357-3658FB5DD5A4} = {041BC663-561E-4F06-BE64-9726BCB51489}
-		{72829E22-9202-475C-8679-C68D558E765C} = {DF04BB29-BEBC-407B-BC52-5F663299E730}
-		{8A6E6618-C4FD-43D2-AE4D-8467EF76972C} = {DF04BB29-BEBC-407B-BC52-5F663299E730}
-		{84FAE820-DB5F-46F2-AA6F-6C85F6D2F9AE} = {DF04BB29-BEBC-407B-BC52-5F663299E730}
-		{9CA7DB33-1534-473F-BCFA-EF1D0BFD186F} = {9747F6FF-7EA7-43BD-A6FC-360C6A1DA2A7}
-		{AC55920C-562F-4429-8F1E-CE9AF9EDC41A} = {041BC663-561E-4F06-BE64-9726BCB51489}
+		{2DABFD88-246F-47C2-B752-24DCF7477CEC} = {5881405B-CA88-4A10-A8AC-1822249AC0FA}
+		{4D762F1C-0905-4B82-9F2C-C0FCD96E2F74} = {2DABFD88-246F-47C2-B752-24DCF7477CEC}
+		{D6C92F41-B72D-4FE3-AF1C-C1D093CF312D} = {2DABFD88-246F-47C2-B752-24DCF7477CEC}
+		{5DB5CE22-96F4-4789-8A48-4F3C164A5972} = {2DABFD88-246F-47C2-B752-24DCF7477CEC}
+		{8091445A-2CAB-43A4-9459-745974D69834} = {5881405B-CA88-4A10-A8AC-1822249AC0FA}
+		{8D94F264-4EE9-4C24-AB77-2CCA36858309} = {9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC}
+		{4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F} = {8D351DB0-74E6-4C1E-A123-34D6BBBD5585}
+		{05A45688-7EEF-4656-818A-2477625C3707} = {8D351DB0-74E6-4C1E-A123-34D6BBBD5585}
+		{1020167A-4101-496E-82CF-41B65769DD28} = {8D351DB0-74E6-4C1E-A123-34D6BBBD5585}
+		{FB21E094-B723-4E7F-B7CB-434BF19B66E1} = {05A45688-7EEF-4656-818A-2477625C3707}
+		{A8292FE6-F29C-46EA-B9C4-788CF8C38C91} = {05A45688-7EEF-4656-818A-2477625C3707}
+		{064C9E03-87C2-4C3C-B228-5C1EE93C719F} = {05A45688-7EEF-4656-818A-2477625C3707}
+		{A561A492-6BA3-42B1-9881-14D844C499FB} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{755DC010-214D-4975-8AAA-6B48CF367935} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{F9ACBE26-EDB6-4E29-8511-DDAE48534D87} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{B9307732-16BB-4289-9D92-E69FEF36C052} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{B08B1EBC-0BA6-478E-B3F4-C1F9D0983615} = {1020167A-4101-496E-82CF-41B65769DD28}
+		{B6E5B2A9-3EF5-47A4-BDC6-66173FDCFFC0} = {1020167A-4101-496E-82CF-41B65769DD28}
+		{9C76F18C-0689-4CE1-A426-EFCBC606D606} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{25637E29-4A69-4E36-B99B-33454506AD14} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{86707ECB-2DC9-4E1C-96F0-BD3C9C610A3C} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{5FA027FC-9973-4331-85F8-A3893823E73C} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{711FA7BE-27DA-425D-9777-967F6E519CFF} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{8E850249-E79D-40E7-B02D-393632DF8B8E} = {9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC}
+		{64A217AE-4E95-468E-85C3-67C27D689FF4} = {9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC}
+		{6F6CA153-1AC6-454A-ACDC-2C706E2A437E} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{8DC55331-B9F3-4811-8474-348662963260} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F}
+		{C3C44E06-E03A-4971-99DA-06F6AD606B3B} = {2DABFD88-246F-47C2-B752-24DCF7477CEC}
+		{A726FD43-B111-423B-BAF6-D65B4C0E37B5} = {8D94F264-4EE9-4C24-AB77-2CCA36858309}
+		{E1D4352C-51AC-4572-8515-0B4E89A2442F} = {8539067C-9968-4AEB-928C-FEDC43989A79}
+		{54DCFBDC-7A2E-439A-92F5-E5A19A2D0DFC} = {8539067C-9968-4AEB-928C-FEDC43989A79}
+		{E470FCE2-DB0D-4771-8C9D-43D8AB85FB80} = {8539067C-9968-4AEB-928C-FEDC43989A79}
+		{3BE998A3-1126-4496-BF60-80D0CEA4D24F} = {8539067C-9968-4AEB-928C-FEDC43989A79}
+		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B} = {1020167A-4101-496E-82CF-41B65769DD28}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8D369B21-3401-4E48-9D47-33012D10B776}
+		SolutionGuid = {9FD7B842-C3E2-4FD0-AD8A-C8E619280AB7}
 	EndGlobalSection
 EndGlobal
diff --git a/VDownload/App.xaml b/VDownload/App.xaml
index 687cdaf..082c390 100644
--- a/VDownload/App.xaml
+++ b/VDownload/App.xaml
@@ -7,10 +7,14 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <ResourceDictionary Source="Dictionaries/Colors.xaml"/>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
                 <ResourceDictionary Source="Dictionaries/Converters.xaml"/>
-                <ResourceDictionary Source="Dictionaries/Images.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Colors.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesLogo.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesSources.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesBaseView.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesHomeDownloadsView.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesHomeVideoView.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs
index 2caf823..08d08a4 100644
--- a/VDownload/App.xaml.cs
+++ b/VDownload/App.xaml.cs
@@ -2,39 +2,34 @@
 using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Microsoft.UI.Xaml.Shapes;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net.Http;
-using System.Runtime.InteropServices.WindowsRuntime;
-using VDownload.GUI.Services.Dialog;
-using VDownload.GUI.Services.ResourceDictionaries;
-using VDownload.GUI.Services.StoragePicker;
-using VDownload.GUI.Services.WebView;
-using VDownload.GUI.ViewModels;
-using VDownload.GUI.Views;
-using VDownload.Services.Authentication;
-using VDownload.Services.Encryption;
-using VDownload.Services.HttpClient;
-using VDownload.Services.Search;
+using VDownload.Core.Tasks;
+using VDownload.Core.ViewModels;
+using VDownload.Core.ViewModels.Authentication;
+using VDownload.Core.ViewModels.Home;
+using VDownload.Core.ViewModels.Settings;
+using VDownload.Core.Views;
+using VDownload.Core.Views.Authentication;
+using VDownload.Core.Views.Home;
+using VDownload.Core.Views.Settings;
+using VDownload.Services.Data.Authentication;
+using VDownload.Services.Data.Configuration;
+using VDownload.Services.Data.Settings;
+using VDownload.Services.UI.Dialogs;
+using VDownload.Services.UI.DictionaryResources;
+using VDownload.Services.UI.Notifications;
+using VDownload.Services.UI.StoragePicker;
+using VDownload.Services.UI.StringResources;
+using VDownload.Services.UI.WebView;
+using VDownload.Services.Utility.Encryption;
+using VDownload.Services.Utility.FFmpeg;
+using VDownload.Services.Utility.HttpClient;
+using VDownload.Sources;
 using VDownload.Sources.Twitch;
 using VDownload.Sources.Twitch.Api;
 using VDownload.Sources.Twitch.Authentication;
-using VDownload.Sources.Twitch.Configuration;
-using VDownload.Sources.Twitch.Search;
-using VDownload.Tasks;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using Windows.Graphics.Printing;
 
 namespace VDownload
 {
@@ -42,7 +37,9 @@ namespace VDownload
     {
         #region FIELDS
 
-        private MainWindow _window;
+        protected IServiceProvider _serviceProvider;
+
+        protected BaseWindow _window;
 
         #endregion
 
@@ -53,66 +50,23 @@ namespace VDownload
         public App()
         {
             this.InitializeComponent();
-            
-            ServiceCollection services = new ServiceCollection();
 
-            // Configuration
-            IConfigurationBuilder configBuilder = new ConfigurationBuilder
-            {
-                Sources =
-                {
-                    new JsonConfigurationSource
-                    {
-                        Path = "appsettings.json"
-                    }
-                }
-            };
-            IConfiguration config = configBuilder.Build();
-            services.AddSingleton(config);
 
-            // Configurations
-            services.AddSingleton<AuthenticationConfiguration>();
-            services.AddSingleton<TwitchConfiguration>();
+            IServiceCollection services = new ServiceCollection();
 
-            // Http client
-            services.AddSingleton<HttpClient>();
+            BuildCore(services);
 
-            // Services
-            services.AddSingleton<IHttpClientService, HttpClientService>();
-            services.AddSingleton<IEncryptionService, EncryptionService>();
-            services.AddSingleton<IAuthenticationService, AuthenticationService>();
-            services.AddSingleton<ITwitchApiService, TwitchApiService>();
-            services.AddSingleton<ITwitchAuthenticationService, TwitchAuthenticationService>();
-            services.AddSingleton<ITwitchSearchService, TwitchSearchService>();
-            services.AddSingleton<ISearchService, SearchService>();
+            BuildConfiguration(services);
 
-            // Tasks manager
-            services.AddSingleton<IDownloadTasksManager, DownloadTasksManager>();
+            BuildDataServices(services);
+            BuildUIServices(services);
+            BuildUtilityServices(services);
+            BuildSourcesServices(services);
 
-            // Resource dictionaries
-            services.AddSingleton<IImagesResourceDictionary, ImagesResourceDictionary>();
+            BuildTasksManager(services);
+            BuildPresentation(services);
 
-            // GUI Services
-            services.AddSingleton<IStoragePickerService, StoragePickerService>();
-            services.AddSingleton<IDialogService, DialogService>();
-            services.AddSingleton<IWebViewService, WebViewService>();
-            services.AddSingleton<IResourceDictionariesServices, ResourceDictionariesServices>();
-
-            // ViewModels
-            services.AddSingleton<HomeViewModel>();
-            services.AddSingleton<SettingsViewModel>();
-            services.AddSingleton<AuthenticationViewModel>();
-
-            // Views
-            services.AddTransient<HomeView>();
-            services.AddTransient<SettingsView>();
-            services.AddTransient<AuthenticationView>();
-
-            // Window
-            services.AddSingleton<MainWindowViewModel>();
-            services.AddTransient<MainWindow>();
-
-            Services.ServiceProvider.Instance = services.BuildServiceProvider();
+            _serviceProvider = services.BuildServiceProvider();
         }
 
         #endregion
@@ -121,16 +75,109 @@ namespace VDownload
 
         #region PRIVATE METHODS
 
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+        protected void BuildCore(IServiceCollection services)
         {
-            _window = Services.ServiceProvider.Instance.GetService<MainWindow>();
+            services.AddSingleton<HttpClient>();
+        }
+
+        protected void BuildConfiguration(IServiceCollection services)
+        {
+            IConfigurationBuilder configBuilder = new ConfigurationBuilder
+            {
+                Sources =
+                {
+                    new JsonConfigurationSource
+                    {
+                        Path = "configuration.json"
+                    }
+                }
+            };
+            IConfiguration config = configBuilder.Build();
+            services.AddSingleton(config);
+        }
+
+        protected void BuildDataServices(IServiceCollection services)
+        {
+            services.AddSingleton<IConfigurationService, ConfigurationService>();
+            services.AddSingleton<IAuthenticationDataService, AuthenticationDataService>();
+            services.AddSingleton<ISettingsService, SettingsService>();
+        }
+
+        protected void BuildUIServices(IServiceCollection services)
+        {
+            services.AddSingleton<IWebViewService, WebViewService>();
+            services.AddSingleton<IStoragePickerService, StoragePickerService>();
+            services.AddSingleton<IDialogsService, DialogsService>();
+            services.AddSingleton<INotificationsService, NotificationsService>();
+            services.AddSingleton<IStringResourcesService, StringResourcesService>();
+            services.AddSingleton<IDictionaryResourcesService, DictionaryResourcesService>();
+        }
+
+        protected void BuildUtilityServices(IServiceCollection services)
+        {
+            services.AddSingleton<IEncryptionService, EncryptionService>();
+            services.AddSingleton<IHttpClientService, HttpClientService>();
+            services.AddSingleton<IFFmpegService, FFmpegService>();
+        }
+
+        protected void BuildSourcesServices(IServiceCollection services)
+        {
+            // Twitch
+            services.AddSingleton<ITwitchApiService, TwitchApiService>();
+            services.AddSingleton<ITwitchAuthenticationService, TwitchAuthenticationService>();
+            services.AddSingleton<ITwitchVideoStreamFactoryService, TwitchVideoStreamFactoryService>();
+            services.AddSingleton<ITwitchSearchService, TwitchSearchService>();
+
+            // Base
+            services.AddSingleton<ISearchService, SearchService>();
+        }
+
+        protected void BuildTasksManager(IServiceCollection services)
+        {
+            services.AddSingleton<IDownloadTaskFactoryService, DownloadTaskFactoryService>();
+            services.AddSingleton<IDownloadTaskManager, DownloadTaskManager>();
+        }
+
+        protected void BuildPresentation(IServiceCollection services)
+        {
+            // ViewModels
+            services.AddSingleton<AuthenticationViewModel>();
+            services.AddSingleton<SettingsViewModel>();
+            services.AddSingleton<HomeDownloadsViewModel>();
+            services.AddSingleton<HomeVideoViewModel>();
+            services.AddSingleton<HomeViewModel>();
+            services.AddSingleton<BaseViewModel>();
+
+            // Views
+            services.AddTransient<AuthenticationView>();
+            services.AddTransient<SettingsView>();
+            services.AddTransient<HomeDownloadsView>();
+            services.AddTransient<HomeVideoView>();
+            services.AddTransient<HomeView>();
+            services.AddTransient<BaseWindow>();
+        }
+
+        protected void AssignStaticProperties()
+        {
+            IStoragePickerService storagePickerService = _serviceProvider.GetService<IStoragePickerService>();
+            storagePickerService.DefaultRoot = _window;
+
+            ViewModelToViewConverter.ServiceProvider = _serviceProvider;
+        }
+
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            _window = _serviceProvider.GetService<BaseWindow>();
+            _window.RootLoaded += Window_RootLoaded;
             _window.Activate();
 
-            IDialogService dialogService = Services.ServiceProvider.Instance.GetService<IDialogService>();
-            dialogService.DefaultRoot = _window.Content.XamlRoot;
+            AssignStaticProperties();
+        }
 
-            IStoragePickerService storagePickerService = Services.ServiceProvider.Instance.GetService<IStoragePickerService>();
-            storagePickerService.DefaultRoot = _window;
+        protected void Window_RootLoaded(object sender, EventArgs e)
+        {
+            IDialogsService dialogsService = _serviceProvider.GetService<IDialogsService>();
+            dialogsService.DefaultRoot = _window.XamlRoot;
         }
 
         #endregion
diff --git a/VDownload/Assets/NavigationView/AuthenticationDark.png b/VDownload/Assets/BaseView/AuthenticationDark.png
similarity index 100%
rename from VDownload/Assets/NavigationView/AuthenticationDark.png
rename to VDownload/Assets/BaseView/AuthenticationDark.png
diff --git a/VDownload/Assets/NavigationView/AuthenticationLight.png b/VDownload/Assets/BaseView/AuthenticationLight.png
similarity index 100%
rename from VDownload/Assets/NavigationView/AuthenticationLight.png
rename to VDownload/Assets/BaseView/AuthenticationLight.png
diff --git a/VDownload/Assets/NavigationView/HomeDark.png b/VDownload/Assets/BaseView/HomeDark.png
similarity index 100%
rename from VDownload/Assets/NavigationView/HomeDark.png
rename to VDownload/Assets/BaseView/HomeDark.png
diff --git a/VDownload/Assets/NavigationView/HomeLight.png b/VDownload/Assets/BaseView/HomeLight.png
similarity index 100%
rename from VDownload/Assets/NavigationView/HomeLight.png
rename to VDownload/Assets/BaseView/HomeLight.png
diff --git a/VDownload/Assets/HomeDownloadsView/CancelledDark.png b/VDownload/Assets/HomeDownloadsView/CancelledDark.png
new file mode 100644
index 0000000..7846b3e
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/CancelledDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/CancelledLight.png b/VDownload/Assets/HomeDownloadsView/CancelledLight.png
new file mode 100644
index 0000000..c8f8d9f
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/CancelledLight.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/DoneDark.png b/VDownload/Assets/HomeDownloadsView/DoneDark.png
new file mode 100644
index 0000000..e9c6302
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/DoneDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/DoneLight.png b/VDownload/Assets/HomeDownloadsView/DoneLight.png
new file mode 100644
index 0000000..2b1fea0
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/DoneLight.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/DownloadingDark.png b/VDownload/Assets/HomeDownloadsView/DownloadingDark.png
new file mode 100644
index 0000000..8ccaab3
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/DownloadingDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/DownloadingLight.png b/VDownload/Assets/HomeDownloadsView/DownloadingLight.png
new file mode 100644
index 0000000..e7a1130
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/DownloadingLight.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/ErrorDark.png b/VDownload/Assets/HomeDownloadsView/ErrorDark.png
new file mode 100644
index 0000000..d35ebe1
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/ErrorDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/ErrorLight.png b/VDownload/Assets/HomeDownloadsView/ErrorLight.png
new file mode 100644
index 0000000..85e7a4c
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/ErrorLight.png differ
diff --git a/VDownload/Assets/Downloads/FileDark.png b/VDownload/Assets/HomeDownloadsView/FileDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/FileDark.png
rename to VDownload/Assets/HomeDownloadsView/FileDark.png
diff --git a/VDownload/Assets/Downloads/FileLight.png b/VDownload/Assets/HomeDownloadsView/FileLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/FileLight.png
rename to VDownload/Assets/HomeDownloadsView/FileLight.png
diff --git a/VDownload/Assets/HomeDownloadsView/FinalizingDark.png b/VDownload/Assets/HomeDownloadsView/FinalizingDark.png
new file mode 100644
index 0000000..dcc56d2
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/FinalizingDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/FinalizingLight.png b/VDownload/Assets/HomeDownloadsView/FinalizingLight.png
new file mode 100644
index 0000000..6e2018c
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/FinalizingLight.png differ
diff --git a/VDownload/Assets/Downloads/IdleDark.png b/VDownload/Assets/HomeDownloadsView/IdleDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/IdleDark.png
rename to VDownload/Assets/HomeDownloadsView/IdleDark.png
diff --git a/VDownload/Assets/Downloads/IdleLight.png b/VDownload/Assets/HomeDownloadsView/IdleLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/IdleLight.png
rename to VDownload/Assets/HomeDownloadsView/IdleLight.png
diff --git a/VDownload/Assets/Downloads/InitializingDark.png b/VDownload/Assets/HomeDownloadsView/InitializingDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/InitializingDark.png
rename to VDownload/Assets/HomeDownloadsView/InitializingDark.png
diff --git a/VDownload/Assets/Downloads/InitializingLight.png b/VDownload/Assets/HomeDownloadsView/InitializingLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/InitializingLight.png
rename to VDownload/Assets/HomeDownloadsView/InitializingLight.png
diff --git a/VDownload/Assets/Downloads/NoTasks.png b/VDownload/Assets/HomeDownloadsView/NoTasks.png
similarity index 100%
rename from VDownload/Assets/Downloads/NoTasks.png
rename to VDownload/Assets/HomeDownloadsView/NoTasks.png
diff --git a/VDownload/Assets/HomeDownloadsView/ProcessingDark.png b/VDownload/Assets/HomeDownloadsView/ProcessingDark.png
new file mode 100644
index 0000000..35fe5ef
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/ProcessingDark.png differ
diff --git a/VDownload/Assets/HomeDownloadsView/ProcessingLight.png b/VDownload/Assets/HomeDownloadsView/ProcessingLight.png
new file mode 100644
index 0000000..8c5cc38
Binary files /dev/null and b/VDownload/Assets/HomeDownloadsView/ProcessingLight.png differ
diff --git a/VDownload/Assets/Downloads/QualityDark.png b/VDownload/Assets/HomeDownloadsView/QualityDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/QualityDark.png
rename to VDownload/Assets/HomeDownloadsView/QualityDark.png
diff --git a/VDownload/Assets/Downloads/QualityLight.png b/VDownload/Assets/HomeDownloadsView/QualityLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/QualityLight.png
rename to VDownload/Assets/HomeDownloadsView/QualityLight.png
diff --git a/VDownload/Assets/Downloads/QueuedDark.png b/VDownload/Assets/HomeDownloadsView/QueuedDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/QueuedDark.png
rename to VDownload/Assets/HomeDownloadsView/QueuedDark.png
diff --git a/VDownload/Assets/Downloads/QueuedLight.png b/VDownload/Assets/HomeDownloadsView/QueuedLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/QueuedLight.png
rename to VDownload/Assets/HomeDownloadsView/QueuedLight.png
diff --git a/VDownload/Assets/Downloads/TimeDark.png b/VDownload/Assets/HomeDownloadsView/TimeDark.png
similarity index 100%
rename from VDownload/Assets/Downloads/TimeDark.png
rename to VDownload/Assets/HomeDownloadsView/TimeDark.png
diff --git a/VDownload/Assets/Downloads/TimeLight.png b/VDownload/Assets/HomeDownloadsView/TimeLight.png
similarity index 100%
rename from VDownload/Assets/Downloads/TimeLight.png
rename to VDownload/Assets/HomeDownloadsView/TimeLight.png
diff --git a/VDownload/Assets/Video/AuthorDark.png b/VDownload/Assets/HomeVideoView/AuthorDark.png
similarity index 100%
rename from VDownload/Assets/Video/AuthorDark.png
rename to VDownload/Assets/HomeVideoView/AuthorDark.png
diff --git a/VDownload/Assets/Video/AuthorLight.png b/VDownload/Assets/HomeVideoView/AuthorLight.png
similarity index 100%
rename from VDownload/Assets/Video/AuthorLight.png
rename to VDownload/Assets/HomeVideoView/AuthorLight.png
diff --git a/VDownload/Assets/Video/DateDark.png b/VDownload/Assets/HomeVideoView/DateDark.png
similarity index 100%
rename from VDownload/Assets/Video/DateDark.png
rename to VDownload/Assets/HomeVideoView/DateDark.png
diff --git a/VDownload/Assets/Video/DateLight.png b/VDownload/Assets/HomeVideoView/DateLight.png
similarity index 100%
rename from VDownload/Assets/Video/DateLight.png
rename to VDownload/Assets/HomeVideoView/DateLight.png
diff --git a/VDownload/Assets/Video/DirectoryDark.png b/VDownload/Assets/HomeVideoView/DirectoryDark.png
similarity index 100%
rename from VDownload/Assets/Video/DirectoryDark.png
rename to VDownload/Assets/HomeVideoView/DirectoryDark.png
diff --git a/VDownload/Assets/Video/DirectoryLight.png b/VDownload/Assets/HomeVideoView/DirectoryLight.png
similarity index 100%
rename from VDownload/Assets/Video/DirectoryLight.png
rename to VDownload/Assets/HomeVideoView/DirectoryLight.png
diff --git a/VDownload/Assets/Video/ExtensionDark.png b/VDownload/Assets/HomeVideoView/ExtensionDark.png
similarity index 100%
rename from VDownload/Assets/Video/ExtensionDark.png
rename to VDownload/Assets/HomeVideoView/ExtensionDark.png
diff --git a/VDownload/Assets/Video/ExtensionLight.png b/VDownload/Assets/HomeVideoView/ExtensionLight.png
similarity index 100%
rename from VDownload/Assets/Video/ExtensionLight.png
rename to VDownload/Assets/HomeVideoView/ExtensionLight.png
diff --git a/VDownload/Assets/Video/FilenameDark.png b/VDownload/Assets/HomeVideoView/FilenameDark.png
similarity index 100%
rename from VDownload/Assets/Video/FilenameDark.png
rename to VDownload/Assets/HomeVideoView/FilenameDark.png
diff --git a/VDownload/Assets/Video/FilenameLight.png b/VDownload/Assets/HomeVideoView/FilenameLight.png
similarity index 100%
rename from VDownload/Assets/Video/FilenameLight.png
rename to VDownload/Assets/HomeVideoView/FilenameLight.png
diff --git a/VDownload/Assets/Video/MediaDark.png b/VDownload/Assets/HomeVideoView/MediaDark.png
similarity index 100%
rename from VDownload/Assets/Video/MediaDark.png
rename to VDownload/Assets/HomeVideoView/MediaDark.png
diff --git a/VDownload/Assets/Video/MediaLight.png b/VDownload/Assets/HomeVideoView/MediaLight.png
similarity index 100%
rename from VDownload/Assets/Video/MediaLight.png
rename to VDownload/Assets/HomeVideoView/MediaLight.png
diff --git a/VDownload/Assets/Video/QualityDark.png b/VDownload/Assets/HomeVideoView/QualityDark.png
similarity index 100%
rename from VDownload/Assets/Video/QualityDark.png
rename to VDownload/Assets/HomeVideoView/QualityDark.png
diff --git a/VDownload/Assets/Video/QualityLight.png b/VDownload/Assets/HomeVideoView/QualityLight.png
similarity index 100%
rename from VDownload/Assets/Video/QualityLight.png
rename to VDownload/Assets/HomeVideoView/QualityLight.png
diff --git a/VDownload/Assets/Video/TimeDark.png b/VDownload/Assets/HomeVideoView/TimeDark.png
similarity index 100%
rename from VDownload/Assets/Video/TimeDark.png
rename to VDownload/Assets/HomeVideoView/TimeDark.png
diff --git a/VDownload/Assets/Video/TimeLight.png b/VDownload/Assets/HomeVideoView/TimeLight.png
similarity index 100%
rename from VDownload/Assets/Video/TimeLight.png
rename to VDownload/Assets/HomeVideoView/TimeLight.png
diff --git a/VDownload/Assets/Video/TrimDark.png b/VDownload/Assets/HomeVideoView/TrimDark.png
similarity index 100%
rename from VDownload/Assets/Video/TrimDark.png
rename to VDownload/Assets/HomeVideoView/TrimDark.png
diff --git a/VDownload/Assets/Video/TrimLight.png b/VDownload/Assets/HomeVideoView/TrimLight.png
similarity index 100%
rename from VDownload/Assets/Video/TrimLight.png
rename to VDownload/Assets/HomeVideoView/TrimLight.png
diff --git a/VDownload/Assets/Video/ViewDark.png b/VDownload/Assets/HomeVideoView/ViewDark.png
similarity index 100%
rename from VDownload/Assets/Video/ViewDark.png
rename to VDownload/Assets/HomeVideoView/ViewDark.png
diff --git a/VDownload/Assets/Video/ViewLight.png b/VDownload/Assets/HomeVideoView/ViewLight.png
similarity index 100%
rename from VDownload/Assets/Video/ViewLight.png
rename to VDownload/Assets/HomeVideoView/ViewLight.png
diff --git a/VDownload/Dictionaries/Colors.xaml b/VDownload/Dictionaries/Colors.xaml
index bf51063..077847a 100644
--- a/VDownload/Dictionaries/Colors.xaml
+++ b/VDownload/Dictionaries/Colors.xaml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="GreyText" Color="#626262"/>
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
diff --git a/VDownload/Dictionaries/Converters.xaml b/VDownload/Dictionaries/Converters.xaml
index b4ca878..c890328 100644
--- a/VDownload/Dictionaries/Converters.xaml
+++ b/VDownload/Dictionaries/Converters.xaml
@@ -2,19 +2,14 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:c="using:VDownload.GUI.Converters">
-    <c:ViewModelToViewConverter x:Key="ViewModelToViewConverter"/>
-    <c:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter"/>
-    <c:EnumToStringConverter x:Key="EnumToStringConverter"/>
-    <c:EnumToIntConverter x:Key="EnumToIntConverter"/>
-    <c:ReverseBooleanConverter x:Key="ReverseBooleanConverter"/>
-    <c:BooleanToStringConverter x:Key="BooleanToStringConverter"/>
-    <c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    <c:BooleanToGridLengthConverter x:Key="BooleanToGridLengthConverter"/>
-    <c:BooleanToGridLengthReversedConverter x:Key="BooleanToGridLengthReversedConverter"/>
-    <c:BooleanToGridLengthFillConverter x:Key="BooleanToGridLengthFillConverter"/>
-    <c:BooleanToGridLengthFillReversedConverter x:Key="BooleanToGridLengthFillReversedConverter"/>
-    <c:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
-    <c:StringToLowerConverter x:Key="StringToLowerConverter"/>
-    <c:StringToUriConverter x:Key="StringToUriConverter"/>
+    xmlns:v="using:VDownload.Core.Views"
+    xmlns:lt="using:VDownload.Toolkit.UI.Converters"
+    xmlns:ct="using:CommunityToolkit.WinUI.Converters">
+    <v:ViewModelToViewConverter x:Key="ViewModelToViewConverter"/>
+
+    <lt:ObjectToStringConverter x:Key="ObjectToStringConverter"/>
+    <lt:ObjectToIntConverter x:Key="ObjectToIntConverter"/>
+
+    <ct:StringFormatConverter x:Key="StringFormatConverter"/>
+    <ct:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
 </ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images.xaml b/VDownload/Dictionaries/Images.xaml
deleted file mode 100644
index f7093a0..0000000
--- a/VDownload/Dictionaries/Images.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- LOGO -->
-    <x:String x:Key="ImageLogo">/Assets/Logo/Logo.png</x:String>
-    
-    <!-- SOURCES -->
-    <x:String x:Key="ImageSourcesTwitch">/Assets/Sources/Twitch.png</x:String>
-    
-    <!-- DOWNLOADS -->
-    <x:String x:Key="ImageDownloadsNoTasks">/Assets/Downloads/NoTasks.png</x:String>
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-            <!-- NAVIGATION VIEW -->
-            <x:String x:Key="ImageNavigationViewAuthentication">/Assets/NavigationView/AuthenticationLight.png</x:String>
-            <x:String x:Key="ImageNavigationViewHome">/Assets/NavigationView/HomeLight.png</x:String>
-
-            <!-- VIDEO -->
-            <x:String x:Key="ImageVideoAuthor">/Assets/Video/AuthorLight.png</x:String>
-            <x:String x:Key="ImageVideoDate">/Assets/Video/DateLight.png</x:String>
-            <x:String x:Key="ImageVideoTime">/Assets/Video/TimeLight.png</x:String>
-            <x:String x:Key="ImageVideoView">/Assets/Video/ViewLight.png</x:String>
-            <x:String x:Key="ImageVideoQuality">/Assets/Video/QualityLight.png</x:String>
-            <x:String x:Key="ImageVideoMedia">/Assets/Video/MediaLight.png</x:String>
-            <x:String x:Key="ImageVideoTrimLeft">/Assets/Video/TrimLeftLight.png</x:String>
-            <x:String x:Key="ImageVideoTrim">/Assets/Video/TrimLight.png</x:String>
-            <x:String x:Key="ImageVideoTrimRight">/Assets/Video/TrimRightLight.png</x:String>
-            <x:String x:Key="ImageVideoDirectory">/Assets/Video/DirectoryLight.png</x:String>
-            <x:String x:Key="ImageVideoFilename">/Assets/Video/FilenameLight.png</x:String>
-            <x:String x:Key="ImageVideoExtension">/Assets/Video/ExtensionLight.png</x:String>
-
-            <!-- DOWNLOADS -->
-            <x:String x:Key="ImageDownloadsQuality">/Assets/Downloads/QualityLight.png</x:String>
-            <x:String x:Key="ImageDownloadsTime">/Assets/Downloads/TimeLight.png</x:String>
-            <x:String x:Key="ImageDownloadsFile">/Assets/Downloads/FileLight.png</x:String>
-            <x:String x:Key="ImageDownloadsIdle">/Assets/Downloads/IdleLight.png</x:String>
-            <x:String x:Key="ImageDownloadsQueued">/Assets/Downloads/QueuedLight.png</x:String>
-            <x:String x:Key="ImageDownloadsInitializing">/Assets/Downloads/InitializingLight.png</x:String>
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Dark">
-            <!-- NAVIGATION VIEW -->
-            <x:String x:Key="ImageNavigationViewAuthentication">/Assets/NavigationView/AuthenticationDark.png</x:String>
-            <x:String x:Key="ImageNavigationViewHome">/Assets/NavigationView/HomeDark.png</x:String>
-
-            <!-- VIDEO -->
-            <x:String x:Key="ImageVideoAuthor">/Assets/Video/AuthorDark.png</x:String>
-            <x:String x:Key="ImageVideoDate">/Assets/Video/DateDark.png</x:String>
-            <x:String x:Key="ImageVideoTime">/Assets/Video/TimeDark.png</x:String>
-            <x:String x:Key="ImageVideoView">/Assets/Video/ViewDark.png</x:String>
-            <x:String x:Key="ImageVideoQuality">/Assets/Video/QualityDark.png</x:String>
-            <x:String x:Key="ImageVideoMedia">/Assets/Video/MediaDark.png</x:String>
-            <x:String x:Key="ImageVideoTrimLeft">/Assets/Video/TrimLeftDark.png</x:String>
-            <x:String x:Key="ImageVideoTrim">/Assets/Video/TrimDark.png</x:String>
-            <x:String x:Key="ImageVideoTrimRight">/Assets/Video/TrimRightDark.png</x:String>
-            <x:String x:Key="ImageVideoDirectory">/Assets/Video/DirectoryDark.png</x:String>
-            <x:String x:Key="ImageVideoFilename">/Assets/Video/FilenameDark.png</x:String>
-            <x:String x:Key="ImageVideoExtension">/Assets/Video/ExtensionDark.png</x:String>
-            
-            <!-- DOWNLOADS -->
-            <x:String x:Key="ImageDownloadsQuality">/Assets/Downloads/QualityDark.png</x:String>
-            <x:String x:Key="ImageDownloadsTime">/Assets/Downloads/TimeDark.png</x:String>
-            <x:String x:Key="ImageDownloadsFile">/Assets/Downloads/FileDark.png</x:String>
-            <x:String x:Key="ImageDownloadsIdle">/Assets/Downloads/IdleDark.png</x:String>
-            <x:String x:Key="ImageDownloadsQueued">/Assets/Downloads/QueuedDark.png</x:String>
-            <x:String x:Key="ImageDownloadsInitializing">/Assets/Downloads/InitializingDark.png</x:String>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesBaseView.xaml b/VDownload/Dictionaries/Images/ImagesBaseView.xaml
new file mode 100644
index 0000000..1555d1c
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesBaseView.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Dark">
+            <x:String x:Key="ImageBaseViewAuthentication">/Assets/BaseView/AuthenticationDark.png</x:String>
+            <x:String x:Key="ImageBaseViewHome">/Assets/BaseView/HomeDark.png</x:String>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <x:String x:Key="ImageBaseViewAuthentication">/Assets/BaseView/AuthenticationLight.png</x:String>
+            <x:String x:Key="ImageBaseViewHome">/Assets/BaseView/HomeLight.png</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesHomeDownloadsView.xaml b/VDownload/Dictionaries/Images/ImagesHomeDownloadsView.xaml
new file mode 100644
index 0000000..e63ab2d
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesHomeDownloadsView.xaml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:String x:Key="ImageHomeDownloadsViewNoTasks">/Assets/HomeDownloadsView/NoTasks.png</x:String>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <x:String x:Key="ImageHomeDownloadsViewQuality">/Assets/HomeDownloadsView/QualityLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewTime">/Assets/HomeDownloadsView/TimeLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewFile">/Assets/HomeDownloadsView/FileLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewIdle">/Assets/HomeDownloadsView/IdleLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewQueued">/Assets/HomeDownloadsView/QueuedLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewInitializing">/Assets/HomeDownloadsView/InitializingLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewCancelled">/Assets/HomeDownloadsView/CancelledLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewDownloading">/Assets/HomeDownloadsView/DownloadingLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewProcessing">/Assets/HomeDownloadsView/ProcessingLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewFinalizing">/Assets/HomeDownloadsView/FinalizingLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewDone">/Assets/HomeDownloadsView/DoneLight.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewError">/Assets/HomeDownloadsView/ErrorLight.png</x:String>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <x:String x:Key="ImageHomeDownloadsViewQuality">/Assets/HomeDownloadsView/QualityDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewTime">/Assets/HomeDownloadsView/TimeDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewFile">/Assets/HomeDownloadsView/FileDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewIdle">/Assets/HomeDownloadsView/IdleDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewQueued">/Assets/HomeDownloadsView/QueuedDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewInitializing">/Assets/HomeDownloadsView/InitializingDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewCancelled">/Assets/HomeDownloadsView/CancelledDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewDownloading">/Assets/HomeDownloadsView/DownloadingDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewProcessing">/Assets/HomeDownloadsView/ProcessingDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewFinalizing">/Assets/HomeDownloadsView/FinalizingDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewDone">/Assets/HomeDownloadsView/DoneDark.png</x:String>
+            <x:String x:Key="ImageHomeDownloadsViewError">/Assets/HomeDownloadsView/ErrorDark.png</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesHomeVideoView.xaml b/VDownload/Dictionaries/Images/ImagesHomeVideoView.xaml
new file mode 100644
index 0000000..eb77eeb
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesHomeVideoView.xaml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <x:String x:Key="ImageHomeVideoViewAuthor">/Assets/HomeVideoView/AuthorLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewDate">/Assets/HomeVideoView/DateLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTime">/Assets/HomeVideoView/TimeLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewViews">/Assets/HomeVideoView/ViewLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewQuality">/Assets/HomeVideoView/QualityLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewMedia">/Assets/HomeVideoView/MediaLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrimLeft">/Assets/HomeVideoView/TrimLeftLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrim">/Assets/HomeVideoView/TrimLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrimRight">/Assets/HomeVideoView/TrimRightLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewDirectory">/Assets/HomeVideoView/DirectoryLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewFilename">/Assets/HomeVideoView/FilenameLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewExtension">/Assets/HomeVideoView/ExtensionLight.png</x:String>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <x:String x:Key="ImageHomeVideoViewAuthor">/Assets/HomeVideoView/AuthorDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewDate">/Assets/HomeVideoView/DateDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTime">/Assets/HomeVideoView/TimeDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewViews">/Assets/HomeVideoView/ViewDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewQuality">/Assets/HomeVideoView/QualityDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewMedia">/Assets/HomeVideoView/MediaDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrimLeft">/Assets/HomeVideoView/TrimLeftDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrim">/Assets/HomeVideoView/TrimDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewTrimRight">/Assets/HomeVideoView/TrimRightDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewDirectory">/Assets/HomeVideoView/DirectoryDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewFilename">/Assets/HomeVideoView/FilenameDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoViewExtension">/Assets/HomeVideoView/ExtensionDark.png</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesLogo.xaml b/VDownload/Dictionaries/Images/ImagesLogo.xaml
new file mode 100644
index 0000000..09e6ce0
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesLogo.xaml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:String x:Key="ImageLogo">/Assets/Logo/Logo.png</x:String>
+</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesSources.xaml b/VDownload/Dictionaries/Images/ImagesSources.xaml
new file mode 100644
index 0000000..233de50
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesSources.xaml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:String x:Key="ImageSourcesTwitch">/Assets/Sources/Twitch.png</x:String>
+</ResourceDictionary>
diff --git a/VDownload/FFmpeg/ffmpeg.exe b/VDownload/FFmpeg/ffmpeg.exe
new file mode 100644
index 0000000..6ad6869
--- /dev/null
+++ b/VDownload/FFmpeg/ffmpeg.exe
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c97605b04e235b26337aa0c2e052d1061f45e701867e3d85f469bef79cd2b73
+size 83374080
diff --git a/VDownload/FFmpeg/ffprobe.exe b/VDownload/FFmpeg/ffprobe.exe
new file mode 100644
index 0000000..9534dd9
--- /dev/null
+++ b/VDownload/FFmpeg/ffprobe.exe
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f34eec6a9aa0b8a0b726e442e946b8d35f4ad63afe12673fd2bdb110807886d
+size 83207680
diff --git a/VDownload/MainWindow.xaml.cs b/VDownload/MainWindow.xaml.cs
deleted file mode 100644
index e3a96f9..0000000
--- a/VDownload/MainWindow.xaml.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Microsoft.UI;
-using Microsoft.UI.Input;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using VDownload.GUI.Services.Dialog;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.Graphics;
-using Windows.UI.WindowManagement;
-using WinRT.Interop;
-
-namespace VDownload
-{
-    public sealed partial class MainWindow : Window
-    {
-        #region SERVICES
-
-        private IDialogService _dialogService;
-
-        #endregion
-
-
-
-        #region CONSTRUCTORS
-
-        public MainWindow(MainWindowViewModel viewModel, IDialogService dialogService)
-        {
-            _dialogService = dialogService;
-
-            this.InitializeComponent();
-            RootPanel.DataContext = viewModel;
-
-            ExtendsContentIntoTitleBar = true;
-            SetTitleBar(AppTitleBar);
-        }
-
-        #endregion
-
-
-
-        #region EVENT HANDLER
-
-        private void RootPanel_Loaded(object sender, RoutedEventArgs e)
-        {
-            _dialogService.DefaultRoot = RootPanel.XamlRoot;
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload/MainWindowViewModel.cs b/VDownload/MainWindowViewModel.cs
deleted file mode 100644
index da80ed8..0000000
--- a/VDownload/MainWindowViewModel.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using VDownload.GUI.Customs.Models;
-using VDownload.GUI.Services.ResourceDictionaries;
-using VDownload.GUI.ViewModels;
-using VDownload.GUI.Views;
-
-namespace VDownload
-{
-    public partial class MainWindowViewModel : ObservableObject
-    {
-        #region SERVICES
-
-        private IResourceDictionariesServices _resourceDictionariesServices;
-
-        #endregion
-
-
-
-        #region FIELDS
-
-        private readonly Type _settingsViewModel = typeof(SettingsViewModel);
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        [ObservableProperty]
-        private Type _currentViewModel;
-
-        [ObservableProperty]
-        private NavigationViewItem _selectedItem;
-
-        public ObservableCollection<NavigationViewItem> Items { get; set; }
-        public ObservableCollection<NavigationViewItem> FooterItems { get; set; }
-
-        #endregion 
-
-
-
-        #region CONSTRUCTORS
-
-        public MainWindowViewModel(IResourceDictionariesServices resourceDictionariesServices) 
-        {
-            _resourceDictionariesServices = resourceDictionariesServices;
-
-            Items = new ObservableCollection<NavigationViewItem>
-            {
-                new NavigationViewItem
-                {
-                    Name = "Home",
-                    IconSource = _resourceDictionariesServices.Images.NavigationViewHome,
-                    ViewModel = typeof(HomeViewModel)
-                }
-            };
-            FooterItems = new ObservableCollection<NavigationViewItem>
-            {
-                new NavigationViewItem
-                {
-                    Name = "Authentication",
-                    IconSource = _resourceDictionariesServices.Images.NavigationViewAuthentication,
-                    ViewModel = typeof(AuthenticationViewModel)
-                }
-            };
-
-            SelectedItem = Items.FirstOrDefault();
-            CurrentViewModel = SelectedItem.ViewModel;
-        }
-
-        #endregion
-
-
-
-        #region COMMANDS
-
-        [RelayCommand]
-        public void Navigate(Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs e)
-        {
-            if (e.IsSettingsInvoked)
-            {
-                CurrentViewModel = _settingsViewModel;
-            }
-            else
-            {
-                NavigationViewItem item = e.InvokedItemContainer.DataContext as NavigationViewItem;
-                CurrentViewModel = item.ViewModel;
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload/Package.appxmanifest b/VDownload/Package.appxmanifest
index de4c5a0..9268db1 100644
--- a/VDownload/Package.appxmanifest
+++ b/VDownload/Package.appxmanifest
@@ -8,11 +8,11 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="876bd3de-7913-450d-98b1-e7a543ac3fbb"
+    Name="df3e7de0-430a-4a93-a68b-48c2f3ec497a"
     Publisher="CN=mateusz"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="876bd3de-7913-450d-98b1-e7a543ac3fbb" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="df3e7de0-430a-4a93-a68b-48c2f3ec497a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>VDownload</DisplayName>
@@ -25,9 +25,9 @@
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
   </Dependencies>
 
-	<Resources>
-		<Resource Language="en-US"/>
-	</Resources>
+  <Resources>
+    <Resource Language="en-US"/>
+  </Resources>
 
   <Applications>
     <Application Id="App"
diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj
index 7db059c..9840fa0 100644
--- a/VDownload/VDownload.csproj
+++ b/VDownload/VDownload.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
@@ -10,10 +10,60 @@
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
+	  <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <UseRidGraph>true</UseRidGraph>
-	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
   </PropertyGroup>
   <ItemGroup>
+    <Content Remove="Assets\BaseView\AuthenticationDark.png" />
+    <Content Remove="Assets\BaseView\AuthenticationLight.png" />
+    <Content Remove="Assets\BaseView\HomeDark.png" />
+    <Content Remove="Assets\BaseView\HomeLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\CancelledDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\CancelledLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\DoneDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\DoneLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\DownloadingDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\DownloadingLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\ErrorDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\ErrorLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\FileDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\FileLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\FinalizingDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\FinalizingLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\IdleDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\IdleLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\InitializingDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\InitializingLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\NoTasks.png" />
+    <Content Remove="Assets\HomeDownloadsView\ProcessingDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\ProcessingLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\QualityDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\QualityLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\QueuedDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\QueuedLight.png" />
+    <Content Remove="Assets\HomeDownloadsView\TimeDark.png" />
+    <Content Remove="Assets\HomeDownloadsView\TimeLight.png" />
+    <Content Remove="Assets\HomeVideoView\AuthorDark.png" />
+    <Content Remove="Assets\HomeVideoView\AuthorLight.png" />
+    <Content Remove="Assets\HomeVideoView\DateDark.png" />
+    <Content Remove="Assets\HomeVideoView\DateLight.png" />
+    <Content Remove="Assets\HomeVideoView\DirectoryDark.png" />
+    <Content Remove="Assets\HomeVideoView\DirectoryLight.png" />
+    <Content Remove="Assets\HomeVideoView\ExtensionDark.png" />
+    <Content Remove="Assets\HomeVideoView\ExtensionLight.png" />
+    <Content Remove="Assets\HomeVideoView\FilenameDark.png" />
+    <Content Remove="Assets\HomeVideoView\FilenameLight.png" />
+    <Content Remove="Assets\HomeVideoView\MediaDark.png" />
+    <Content Remove="Assets\HomeVideoView\MediaLight.png" />
+    <Content Remove="Assets\HomeVideoView\QualityDark.png" />
+    <Content Remove="Assets\HomeVideoView\QualityLight.png" />
+    <Content Remove="Assets\HomeVideoView\TimeDark.png" />
+    <Content Remove="Assets\HomeVideoView\TimeLight.png" />
+    <Content Remove="Assets\HomeVideoView\TrimDark.png" />
+    <Content Remove="Assets\HomeVideoView\TrimLight.png" />
+    <Content Remove="Assets\HomeVideoView\ViewDark.png" />
+    <Content Remove="Assets\HomeVideoView\ViewLight.png" />
+    <Content Remove="Assets\Logo\Logo.png" />
     <Content Remove="Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
     <Content Remove="Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
     <Content Remove="Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
@@ -24,15 +74,14 @@
     <Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-256.png" />
     <Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-32.png" />
     <Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Remove="Assets\Sources\Twitch.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="appsettings.json" />
     <None Remove="Assets\Logo\LargeTile.scale-100.png" />
     <None Remove="Assets\Logo\LargeTile.scale-125.png" />
     <None Remove="Assets\Logo\LargeTile.scale-150.png" />
     <None Remove="Assets\Logo\LargeTile.scale-200.png" />
     <None Remove="Assets\Logo\LargeTile.scale-400.png" />
-    <None Remove="Assets\Logo\Logo.png" />
     <None Remove="Assets\Logo\SmallTile.scale-100.png" />
     <None Remove="Assets\Logo\SmallTile.scale-125.png" />
     <None Remove="Assets\Logo\SmallTile.scale-150.png" />
@@ -54,17 +103,10 @@
     <None Remove="Assets\Logo\Square44x44Logo.scale-200.png" />
     <None Remove="Assets\Logo\Square44x44Logo.scale-400.png" />
     <None Remove="Assets\Logo\Square44x44Logo.targetsize-16.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-16_altform-lightunplated.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-16_altform-unplated.png" />
     <None Remove="Assets\Logo\Square44x44Logo.targetsize-24.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-24_altform-lightunplated.png" />
     <None Remove="Assets\Logo\Square44x44Logo.targetsize-256.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-256_altform-lightunplated.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-256_altform-unplated.png" />
     <None Remove="Assets\Logo\Square44x44Logo.targetsize-32.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-32_altform-lightunplated.png" />
     <None Remove="Assets\Logo\Square44x44Logo.targetsize-48.png" />
-    <None Remove="Assets\Logo\Square44x44Logo.targetsize-48_altform-unplated.png" />
     <None Remove="Assets\Logo\StoreLogo.scale-100.png" />
     <None Remove="Assets\Logo\StoreLogo.scale-125.png" />
     <None Remove="Assets\Logo\StoreLogo.scale-150.png" />
@@ -77,211 +119,235 @@
     <None Remove="Assets\Logo\Wide310x150Logo.scale-400.png" />
     <None Remove="Dictionaries\Colors.xaml" />
     <None Remove="Dictionaries\Converters.xaml" />
-    <None Remove="Dictionaries\Images.xaml" />
+    <None Remove="Dictionaries\Images\ImagesBaseView.xaml" />
+    <None Remove="Dictionaries\Images\ImagesHomeDownloadsView.xaml" />
+    <None Remove="Dictionaries\Images\ImagesHomeVideoView.xaml" />
+    <None Remove="Dictionaries\Images\ImagesLogo.xaml" />
+    <None Remove="Dictionaries\Images\ImagesSources.xaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
-  <!-- 
-    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-    Tools extension to be activated for this project even if the Windows App SDK Nuget
-    package has not yet been restored.
-  -->
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Converters\VDownload.GUI.Converters.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Customs\VDownload.GUI.Customs.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.Dialog\VDownload.GUI.Services.Dialog.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.ResourceDictionaries\VDownload.GUI.Services.ResourceDictionaries.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.StoragePicker\VDownload.GUI.Services.StoragePicker.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Services\VDownload.GUI.Services.WebView\VDownload.GUI.Services.WebView.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.ViewModels\VDownload.GUI.ViewModels.csproj" />
-    <ProjectReference Include="..\VDownload.GUI\VDownload.GUI.Views\VDownload.GUI.Views.csproj" />
-    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Authentication\VDownload.Services.Authentication.csproj" />
-    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Encryption\VDownload.Services.Encryption.csproj" />
-    <ProjectReference Include="..\VDownload.Services\VDownload.Services.HttpClient\VDownload.Services.HttpClient.csproj" />
-    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Search\VDownload.Services.Search.csproj" />
-    <ProjectReference Include="..\VDownload.Services\VDownload.Services\VDownload.Services.csproj" />
+    <Folder Include="FFmpeg\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VDownload.Core\VDownload.Core.ViewModels\VDownload.Core.ViewModels.csproj" />
+    <ProjectReference Include="..\VDownload.Core\VDownload.Core.Views\VDownload.Core.Views.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Authentication\VDownload.Services.Data.Authentication.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Dialogs\VDownload.Services.UI.Dialogs.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.DictionaryResources\VDownload.Services.UI.DictionaryResources.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Notifications\VDownload.Services.UI.Notifications.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StoragePicker\VDownload.Services.UI.StoragePicker.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.WebView\VDownload.Services.UI.WebView.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.Encryption\VDownload.Services.Utility.Encryption.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.FFmpeg\VDownload.Services.Utility.FFmpeg.csproj" />
+    <ProjectReference Include="..\VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.HttpClient\VDownload.Services.Utility.HttpClient.csproj" />
+    <ProjectReference Include="..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Api\VDownload.Sources.Twitch.Api.csproj" />
     <ProjectReference Include="..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Authentication\VDownload.Sources.Twitch.Authentication.csproj" />
     <ProjectReference Include="..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
-    <ProjectReference Include="..\VDownload.Tasks\VDownload.Tasks.csproj" />
+    <ProjectReference Include="..\VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj" />
+    <ProjectReference Include="..\VDownload.Toolkit\VDownload.Toolkit.UI\VDownload.Toolkit.UI.Converters\VDownload.Toolkit.UI.Converters.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Content Update="Assets\Downloads\FileDark.png">
+    <None Update="Assets\BaseView\AuthenticationDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\FileLight.png">
+    </None>
+    <None Update="Assets\BaseView\AuthenticationLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\IdleDark.png">
+    </None>
+    <None Update="Assets\BaseView\HomeDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\IdleLight.png">
+    </None>
+    <None Update="Assets\BaseView\HomeLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\InitializingDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\CancelledDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\InitializingLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\CancelledLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\NoTasks.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\DoneDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\QualityDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\DoneLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\QualityLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\DownloadingDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\QueuedDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\DownloadingLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\QueuedLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\ErrorDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\TimeDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\ErrorLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Downloads\TimeLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\FileDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Logo\Logo.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\FileLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\NavigationView\AuthenticationDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\FinalizingDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\NavigationView\AuthenticationLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\FinalizingLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\NavigationView\HomeDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\IdleDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\NavigationView\HomeLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\IdleLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Sources\Twitch.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\InitializingDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\AuthorDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\InitializingLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\AuthorLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\NoTasks.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\DateDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\ProcessingDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\DateLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\ProcessingLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\DirectoryDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\QualityDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\DirectoryLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\QualityLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\ExtensionDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\QueuedDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\ExtensionLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\QueuedLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\FilenameDark.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\TimeDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\FilenameLight.png">
+    </None>
+    <None Update="Assets\HomeDownloadsView\TimeLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\MediaDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\AuthorDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\MediaLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\AuthorLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\QualityDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\DateDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\QualityDark.svg">
+    </None>
+    <None Update="Assets\HomeVideoView\DateLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\QualityLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\DirectoryDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\QualityLight.svg">
+    </None>
+    <None Update="Assets\HomeVideoView\DirectoryLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TimeDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\ExtensionDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TimeLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\ExtensionLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\FilenameDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimLeftDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\FilenameLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimLeftLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\MediaDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\MediaLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimRightDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\QualityDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\TrimRightLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\QualityLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\ViewDark.png">
+    </None>
+    <None Update="Assets\HomeVideoView\TimeDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Video\ViewLight.png">
+    </None>
+    <None Update="Assets\HomeVideoView\TimeLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Dictionaries\Images.xaml">
+    </None>
+    <None Update="Assets\HomeVideoView\TrimDark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\HomeVideoView\TrimLight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\HomeVideoView\ViewDark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\HomeVideoView\ViewLight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\Logo\Logo.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\Sources\Twitch.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="configuration.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <Page Update="Dictionaries\Images\ImagesHomeDownloadsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Dictionaries\Images\ImagesHomeVideoView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Dictionaries\Images\ImagesSources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Dictionaries\Images\ImagesBaseView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Dictionaries\Colors.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Dictionaries\Assets\AssetsLogo.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-  </ItemGroup>
-  <ItemGroup>
     <Page Update="Dictionaries\Converters.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Dictionaries\Colors.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
+    <None Update="FFmpeg\ffmpeg.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="FFmpeg\ffprobe.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
-  <!-- 
-    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution 
-    Explorer "Package and Publish" context menu entry to be enabled for this project even if 
-    the Windows App SDK Nuget package has not yet been restored.
-  -->
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
diff --git a/VDownload/app.manifest b/VDownload/app.manifest
index f667b70..f61aa10 100644
--- a/VDownload/app.manifest
+++ b/VDownload/app.manifest
@@ -4,9 +4,6 @@
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>
diff --git a/VDownload/appsettings.json b/VDownload/appsettings.json
deleted file mode 100644
index d3ccdd6..0000000
--- a/VDownload/appsettings.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "authentication": {
-    "file_path": "VDownload/authentication.json"
-  },
-  "sources": {
-    "twitch": {
-      "api": {
-        "auth": {
-          "token_schema": "OAuth",
-          "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
-          "endpoints": {
-            "validate": "https://id.twitch.tv/oauth2/validate",
-          }
-        },
-        "helix": {
-          "token_schema": "Bearer",
-          "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
-          "endpoints": {
-            "get_videos": "https://api.twitch.tv/helix/videos"
-          }
-        },
-        "gql": {
-          "client_id": "kd1unb4b3q4t58fwlpcbzcbnm76a8fp",
-          "endpoint": "https://gql.twitch.tv/gql",
-          "queries": {
-            "get_video_token": {
-              "operation_name": "PlaybackAccessToken_Template",
-              "query": "query PlaybackAccessToken_Template($login: String!, $isLive: Boolean!, $vodID: ID!, $isVod: Boolean!, $playerType: String!) {  streamPlaybackAccessToken(channelName: $login, params: {platform: \"web\", playerBackend: \"mediaplayer\", playerType: $playerType}) @include(if: $isLive) {    value    signature    __typename  }  videoPlaybackAccessToken(id: $vodID, params: {platform: \"web\", playerBackend: \"mediaplayer\", playerType: $playerType}) @include(if: $isVod) {    value    signature    __typename  }}"
-            }
-          }
-        },
-        "usher": {
-          "endpoints": {
-            "get_video_playlist": "https://usher.ttvnw.net/vod/{0}.m3u8"
-          }
-        }
-      },
-      "search": {
-        "general_regexes": [
-          "twitch\\.tv"
-        ],
-        "vod_regexes": [
-          "videos\\/(\\d+)"
-        ],
-        "vod_stream_playlist_regex": "#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID=\"\\w+\",NAME=\"(?<id>.+)\",AUTOSELECT=\\w+,DEFAULT=\\w+\\n#EXT-X-STREAM-INF:BANDWIDTH=\\d+,CODECS=\"(?<codecs>.+)\",RESOLUTION=(?<width>\\d+)x(?<height>\\d+),VIDEO=\".+\"(?:,FRAME-RATE=(?<framerate>\\d+.\\d+))?\n(?<url>.+)",
-        "vod_thumbnail_width": 1920,
-        "vod_thumbnail_height": 1080
-      },
-      "authentication": {
-        "url": "https://id.twitch.tv/oauth2/authorize?client_id={0}&redirect_uri={1}&response_type={2}&scope={3}",
-        "redirect_url": "https://www.vd.com",
-        "redirect_url_regex": "^https:\\/\\/www.vd.com\\/#access_token=(\\w+)",
-        "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
-        "response_type": "token",
-        "scopes": [
-          "user:read:subscriptions"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/VDownload/configuration.json b/VDownload/configuration.json
new file mode 100644
index 0000000..7d227f7
--- /dev/null
+++ b/VDownload/configuration.json
@@ -0,0 +1,170 @@
+{
+  "common": {
+    "processing": {
+      "muxers": [
+        {
+          "extension": "mp4",
+          "video_codecs": [
+            "h264"
+          ],
+          "audio_codecs": [
+            "aac"
+          ]
+        },
+        {
+          "extension": "mkv",
+          "video_codecs": [
+            "h264"
+          ],
+          "audio_codecs": [
+            "vorbis",
+            "aac"
+          ]
+        },
+        {
+          "extension": "avi",
+          "video_codecs": [
+            "mpeg4",
+            "h264"
+          ],
+          "audio_codecs": [
+            "mp3"
+          ]
+        },
+        {
+          "extension": "mov",
+          "video_codecs": [
+            "h264"
+          ],
+          "audio_codecs": [
+            "aac"
+          ]
+        },
+        {
+          "extension": "webm",
+          "video_codecs": [
+            "vp9",
+            "vp8",
+            "av1"
+          ],
+          "audio_codecs": [
+            "libopus",
+            "vorbis"
+          ]
+        },
+        {
+          "extension": "wmv",
+          "video_codecs": [
+            "msmpeg4v3",
+            "h264"
+          ],
+          "audio_codecs": [
+            "wmav2"
+          ]
+        },
+        {
+          "extension": "mp3",
+          "audio_codecs": [
+            "mp3"
+          ]
+        },
+        {
+          "extension": "flac",
+          "audio_codecs": [
+            "flac"
+          ]
+        },
+        {
+          "extension": "ogg",
+          "audio_codecs": [
+            "aac",
+            "vorbis"
+          ]
+        },
+        {
+          "extension": "wav",
+          "audio_codecs": [
+            "aac",
+            "pcm_s16le"
+          ]
+        }
+      ],
+      "processed_filename": "processed"
+    },
+    "path": {
+      "appdata": {
+        "directory_name": "VDownload",
+        "authentication_file": "authentication.json",
+        "settings_file": "settings.json"
+      },
+      "temp": {
+        "tasks_directory": "tasks"
+      }
+    },
+    "string_resources_assembly": "VDownload.Core.Strings"
+  },
+  "twitch": {
+    "api": {
+      "auth": {
+        "token_schema": "OAuth",
+        "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
+        "endpoints": {
+          "validate": "https://id.twitch.tv/oauth2/validate"
+        }
+      },
+      "helix": {
+        "token_schema": "Bearer",
+        "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
+        "endpoints": {
+          "get_videos": "https://api.twitch.tv/helix/videos"
+        }
+      },
+      "gql": {
+        "client_id": "kd1unb4b3q4t58fwlpcbzcbnm76a8fp",
+        "endpoint": "https://gql.twitch.tv/gql",
+        "queries": {
+          "get_video_token": {
+            "operation_name": "PlaybackAccessToken_Template",
+            "query": "query PlaybackAccessToken_Template($login: String!, $isLive: Boolean!, $vodID: ID!, $isVod: Boolean!, $playerType: String!) {  streamPlaybackAccessToken(channelName: $login, params: {platform: \"web\", playerBackend: \"mediaplayer\", playerType: $playerType}) @include(if: $isLive) {    value    signature    __typename  }  videoPlaybackAccessToken(id: $vodID, params: {platform: \"web\", playerBackend: \"mediaplayer\", playerType: $playerType}) @include(if: $isVod) {    value    signature    __typename  }}"
+          }
+        }
+      },
+      "usher": {
+        "endpoints": {
+          "get_video_playlist": "https://usher.ttvnw.net/vod/{0}.m3u8"
+        }
+      }
+    },
+    "search": {
+      "general_regexes": [
+        "twitch\\.tv"
+      ],
+      "vod": {
+        "regexes": [
+          "videos\\/(\\d+)"
+        ],
+        "thumbnail": {
+          "width": 1920,
+          "height": 1080
+        },
+        "stream_playlist_regex": "#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID=\"\\w+\",NAME=\"(?<id>.+)\",AUTOSELECT=\\w+,DEFAULT=\\w+\\n#EXT-X-STREAM-INF:BANDWIDTH=\\d+,CODECS=\"(?<video_codec>.+),(?<audio_codec>.+)\",RESOLUTION=(?<width>\\d+)x(?<height>\\d+),VIDEO=\".+\"(?:,FRAME-RATE=(?<framerate>\\d+.\\d+))?\n(?<url>.+)"
+      }
+    },
+    "download": {
+      "vod": {
+        "chunk_regex": "#EXTINF:(?<duration>\\d+.\\d+),\\n(?<file>.+)",
+        "file_name": "raw.ts"
+      }
+    },
+    "authentication": {
+      "url": "https://id.twitch.tv/oauth2/authorize?client_id={0}&redirect_uri={1}&response_type={2}&scope={3}",
+      "redirect_url": "https://www.vd.com",
+      "redirect_url_regex": "^https:\\/\\/www.vd.com\\/#access_token=(\\w+)",
+      "client_id": "yukkqkwp61wsv3u1pya17crpyaa98y",
+      "response_type": "token",
+      "scopes": [
+        "user:read:subscriptions"
+      ]
+    }
+  }
+}
\ No newline at end of file