diff --git a/AD_MAUI.sln b/AD_MAUI.sln
index fe49081..89a16ca 100644
--- a/AD_MAUI.sln
+++ b/AD_MAUI.sln
@@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AD_MAUI", "AD_MAUI\AD_MAUI.csproj", "{75950E63-4D00-4240-91D9-F4D494878A3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMC.View", "AMC.View\AMC.View.csproj", "{75950E63-4D00-4240-91D9-F4D494878A3B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMC.Model", "AMC.Model\AMC.Model.csproj", "{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMC.ViewModel", "AMC.ViewModel\AMC.ViewModel.csproj", "{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,6 +21,14 @@ Global
 		{75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AMC.Model/AMC.Model.csproj b/AMC.Model/AMC.Model.csproj
new file mode 100644
index 0000000..cfadb03
--- /dev/null
+++ b/AMC.Model/AMC.Model.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/AD_MAUI/Model/Album.cs b/AMC.Model/Models/Album.cs
similarity index 94%
rename from AD_MAUI/Model/Album.cs
rename to AMC.Model/Models/Album.cs
index aea8080..5b47632 100644
--- a/AD_MAUI/Model/Album.cs
+++ b/AMC.Model/Models/Album.cs
@@ -1,4 +1,4 @@
-namespace AD_MAUI.Model
+namespace AMC.Model
 {
     public class Album
     {
diff --git a/AD_MAUI/Model/Song.cs b/AMC.Model/Models/Song.cs
similarity index 88%
rename from AD_MAUI/Model/Song.cs
rename to AMC.Model/Models/Song.cs
index bdb8a54..a565469 100644
--- a/AD_MAUI/Model/Song.cs
+++ b/AMC.Model/Models/Song.cs
@@ -1,4 +1,4 @@
-namespace AD_MAUI.Model
+namespace AMC.Model
 {
     public class Song
     {
diff --git a/AD_MAUI/AD_MAUI.csproj b/AMC.View/AMC.View.csproj
similarity index 92%
rename from AD_MAUI/AD_MAUI.csproj
rename to AMC.View/AMC.View.csproj
index a3b0c37..417d8f3 100644
--- a/AD_MAUI/AD_MAUI.csproj
+++ b/AMC.View/AMC.View.csproj
@@ -7,16 +7,16 @@
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-		<RootNamespace>AD_MAUI</RootNamespace>
+		<RootNamespace>AMC.View</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<!-- Display name -->
-		<ApplicationTitle>AD_MAUI</ApplicationTitle>
+		<ApplicationTitle>Apple Music Clone</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.ad_maui</ApplicationId>
+		<ApplicationId>fr.uca.iut.amc.view</ApplicationId>
 		<ApplicationIdGuid>8fc1ba53-e1de-4aad-91d7-412badab5c89</ApplicationIdGuid>
 
 		<!-- Versions -->
@@ -57,13 +57,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Views\AlbumPage.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
+	  <ProjectReference Include="..\AMC.ViewModel\AMC.ViewModel.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="Pages\" />
+	  <MauiXaml Update="Views\AlbumPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/AD_MAUI/App.xaml b/AMC.View/App.xaml
similarity index 86%
rename from AD_MAUI/App.xaml
rename to AMC.View/App.xaml
index 8b73a0b..00e4332 100644
--- a/AD_MAUI/App.xaml
+++ b/AMC.View/App.xaml
@@ -1,8 +1,8 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:AD_MAUI"
-             x:Class="AD_MAUI.App">
+             xmlns:local="clr-namespace:AMC.View"
+             x:Class="AMC.View.App">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/AD_MAUI/App.xaml.cs b/AMC.View/App.xaml.cs
similarity index 85%
rename from AD_MAUI/App.xaml.cs
rename to AMC.View/App.xaml.cs
index 9af73ec..4598800 100644
--- a/AD_MAUI/App.xaml.cs
+++ b/AMC.View/App.xaml.cs
@@ -1,4 +1,4 @@
-namespace AD_MAUI;
+namespace AMC.View;
 
 public partial class App : Application
 {
diff --git a/AD_MAUI/AppShell.xaml b/AMC.View/AppShell.xaml
similarity index 82%
rename from AD_MAUI/AppShell.xaml
rename to AMC.View/AppShell.xaml
index 77e6664..3e3e366 100644
--- a/AD_MAUI/AppShell.xaml
+++ b/AMC.View/AppShell.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="AD_MAUI.AppShell"
+    x:Class="AMC.View.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:AD_MAUI"
+    xmlns:local="clr-namespace:AMC.View"
     Shell.FlyoutBehavior="Disabled">
 
     <ShellContent
diff --git a/AD_MAUI/AppShell.xaml.cs b/AMC.View/AppShell.xaml.cs
similarity index 82%
rename from AD_MAUI/AppShell.xaml.cs
rename to AMC.View/AppShell.xaml.cs
index f2a9717..69eb1f7 100644
--- a/AD_MAUI/AppShell.xaml.cs
+++ b/AMC.View/AppShell.xaml.cs
@@ -1,4 +1,4 @@
-namespace AD_MAUI;
+namespace AMC.View;
 
 public partial class AppShell : Shell
 {
diff --git a/AD_MAUI/MainPage.xaml b/AMC.View/MainPage.xaml
similarity index 87%
rename from AD_MAUI/MainPage.xaml
rename to AMC.View/MainPage.xaml
index 3fb575c..113fea4 100644
--- a/AD_MAUI/MainPage.xaml
+++ b/AMC.View/MainPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="AD_MAUI.MainPage">
+             x:Class="AMC.View.MainPage">
 
     <Button
         x:Name="RdmBtn"
diff --git a/AD_MAUI/MainPage.xaml.cs b/AMC.View/MainPage.xaml.cs
similarity index 82%
rename from AD_MAUI/MainPage.xaml.cs
rename to AMC.View/MainPage.xaml.cs
index 42baf0a..a2b56cd 100644
--- a/AD_MAUI/MainPage.xaml.cs
+++ b/AMC.View/MainPage.xaml.cs
@@ -1,7 +1,6 @@
-using AD_MAUI.ViewModel;
-using AD_MAUI.Views;
+using AMC.ViewModel;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 public partial class MainPage : ContentPage
 {
diff --git a/AD_MAUI/MauiProgram.cs b/AMC.View/MauiProgram.cs
similarity index 96%
rename from AD_MAUI/MauiProgram.cs
rename to AMC.View/MauiProgram.cs
index b25eb45..ed5dff4 100644
--- a/AD_MAUI/MauiProgram.cs
+++ b/AMC.View/MauiProgram.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 public static class MauiProgram
 {
diff --git a/AD_MAUI/Platforms/Android/AndroidManifest.xml b/AMC.View/Platforms/Android/AndroidManifest.xml
similarity index 100%
rename from AD_MAUI/Platforms/Android/AndroidManifest.xml
rename to AMC.View/Platforms/Android/AndroidManifest.xml
diff --git a/AD_MAUI/Platforms/Android/MainActivity.cs b/AMC.View/Platforms/Android/MainActivity.cs
similarity index 94%
rename from AD_MAUI/Platforms/Android/MainActivity.cs
rename to AMC.View/Platforms/Android/MainActivity.cs
index 123cb2a..c97fca4 100644
--- a/AD_MAUI/Platforms/Android/MainActivity.cs
+++ b/AMC.View/Platforms/Android/MainActivity.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Content.PM;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
 public class MainActivity : MauiAppCompatActivity
diff --git a/AD_MAUI/Platforms/Android/MainApplication.cs b/AMC.View/Platforms/Android/MainApplication.cs
similarity index 93%
rename from AD_MAUI/Platforms/Android/MainApplication.cs
rename to AMC.View/Platforms/Android/MainApplication.cs
index fba6b19..5a6db74 100644
--- a/AD_MAUI/Platforms/Android/MainApplication.cs
+++ b/AMC.View/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 [Application]
 public class MainApplication : MauiApplication
diff --git a/AD_MAUI/Platforms/Android/Resources/values/colors.xml b/AMC.View/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from AD_MAUI/Platforms/Android/Resources/values/colors.xml
rename to AMC.View/Platforms/Android/Resources/values/colors.xml
diff --git a/AD_MAUI/Platforms/iOS/AppDelegate.cs b/AMC.View/Platforms/MacCatalyst/AppDelegate.cs
similarity index 90%
rename from AD_MAUI/Platforms/iOS/AppDelegate.cs
rename to AMC.View/Platforms/MacCatalyst/AppDelegate.cs
index 4235d0b..44689ad 100644
--- a/AD_MAUI/Platforms/iOS/AppDelegate.cs
+++ b/AMC.View/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
diff --git a/AD_MAUI/Platforms/MacCatalyst/Info.plist b/AMC.View/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from AD_MAUI/Platforms/MacCatalyst/Info.plist
rename to AMC.View/Platforms/MacCatalyst/Info.plist
diff --git a/AD_MAUI/Platforms/MacCatalyst/Program.cs b/AMC.View/Platforms/MacCatalyst/Program.cs
similarity index 94%
rename from AD_MAUI/Platforms/MacCatalyst/Program.cs
rename to AMC.View/Platforms/MacCatalyst/Program.cs
index 3540c53..b4c76b7 100644
--- a/AD_MAUI/Platforms/MacCatalyst/Program.cs
+++ b/AMC.View/Platforms/MacCatalyst/Program.cs
@@ -1,6 +1,6 @@
 using UIKit;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 public class Program
 {
diff --git a/AD_MAUI/Platforms/Tizen/Main.cs b/AMC.View/Platforms/Tizen/Main.cs
similarity index 92%
rename from AD_MAUI/Platforms/Tizen/Main.cs
rename to AMC.View/Platforms/Tizen/Main.cs
index 5d7ad99..0e4dd83 100644
--- a/AD_MAUI/Platforms/Tizen/Main.cs
+++ b/AMC.View/Platforms/Tizen/Main.cs
@@ -2,7 +2,7 @@ using System;
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 class Program : MauiApplication
 {
diff --git a/AD_MAUI/Platforms/Tizen/tizen-manifest.xml b/AMC.View/Platforms/Tizen/tizen-manifest.xml
similarity index 84%
rename from AD_MAUI/Platforms/Tizen/tizen-manifest.xml
rename to AMC.View/Platforms/Tizen/tizen-manifest.xml
index 3b26217..098d6b7 100644
--- a/AD_MAUI/Platforms/Tizen/tizen-manifest.xml
+++ b/AMC.View/Platforms/Tizen/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <ui-application appid="maui-application-id-placeholder" exec="AD_MAUI.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+  <ui-application appid="maui-application-id-placeholder" exec="AMC.View.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
     <label>maui-application-title-placeholder</label>
     <icon>maui-appicon-placeholder</icon>
     <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
diff --git a/AD_MAUI/Platforms/Windows/App.xaml b/AMC.View/Platforms/Windows/App.xaml
similarity index 75%
rename from AD_MAUI/Platforms/Windows/App.xaml
rename to AMC.View/Platforms/Windows/App.xaml
index 47d0b7b..ab27179 100644
--- a/AD_MAUI/Platforms/Windows/App.xaml
+++ b/AMC.View/Platforms/Windows/App.xaml
@@ -1,8 +1,8 @@
 <maui:MauiWinUIApplication
-    x:Class="AD_MAUI.WinUI.App"
+    x:Class="AMC.View.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:AD_MAUI.WinUI">
+    xmlns:local="using:AMC.View.WinUI">
 
 </maui:MauiWinUIApplication>
diff --git a/AD_MAUI/Platforms/Windows/App.xaml.cs b/AMC.View/Platforms/Windows/App.xaml.cs
similarity index 96%
rename from AD_MAUI/Platforms/Windows/App.xaml.cs
rename to AMC.View/Platforms/Windows/App.xaml.cs
index 38b7d8f..1dbdebe 100644
--- a/AD_MAUI/Platforms/Windows/App.xaml.cs
+++ b/AMC.View/Platforms/Windows/App.xaml.cs
@@ -1,7 +1,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace AD_MAUI.WinUI;
+namespace AMC.View.WinUI;
 
 /// <summary>
 /// Provides application-specific behavior to supplement the default Application class.
diff --git a/AD_MAUI/Platforms/Windows/Package.appxmanifest b/AMC.View/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from AD_MAUI/Platforms/Windows/Package.appxmanifest
rename to AMC.View/Platforms/Windows/Package.appxmanifest
diff --git a/AD_MAUI/Platforms/Windows/app.manifest b/AMC.View/Platforms/Windows/app.manifest
similarity index 90%
rename from AD_MAUI/Platforms/Windows/app.manifest
rename to AMC.View/Platforms/Windows/app.manifest
index 621c03b..4834b55 100644
--- a/AD_MAUI/Platforms/Windows/app.manifest
+++ b/AMC.View/Platforms/Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="AD_MAUI.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="AMC.View.WinUI.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
diff --git a/AD_MAUI/Platforms/MacCatalyst/AppDelegate.cs b/AMC.View/Platforms/iOS/AppDelegate.cs
similarity index 90%
rename from AD_MAUI/Platforms/MacCatalyst/AppDelegate.cs
rename to AMC.View/Platforms/iOS/AppDelegate.cs
index 4235d0b..44689ad 100644
--- a/AD_MAUI/Platforms/MacCatalyst/AppDelegate.cs
+++ b/AMC.View/Platforms/iOS/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
diff --git a/AD_MAUI/Platforms/iOS/Info.plist b/AMC.View/Platforms/iOS/Info.plist
similarity index 100%
rename from AD_MAUI/Platforms/iOS/Info.plist
rename to AMC.View/Platforms/iOS/Info.plist
diff --git a/AD_MAUI/Platforms/iOS/Program.cs b/AMC.View/Platforms/iOS/Program.cs
similarity index 94%
rename from AD_MAUI/Platforms/iOS/Program.cs
rename to AMC.View/Platforms/iOS/Program.cs
index 3540c53..b4c76b7 100644
--- a/AD_MAUI/Platforms/iOS/Program.cs
+++ b/AMC.View/Platforms/iOS/Program.cs
@@ -1,6 +1,6 @@
 using UIKit;
 
-namespace AD_MAUI;
+namespace AMC.View;
 
 public class Program
 {
diff --git a/AD_MAUI/Properties/launchSettings.json b/AMC.View/Properties/launchSettings.json
similarity index 100%
rename from AD_MAUI/Properties/launchSettings.json
rename to AMC.View/Properties/launchSettings.json
diff --git a/AD_MAUI/Resources/AppIcon/appicon.svg b/AMC.View/Resources/AppIcon/appicon.svg
similarity index 100%
rename from AD_MAUI/Resources/AppIcon/appicon.svg
rename to AMC.View/Resources/AppIcon/appicon.svg
diff --git a/AD_MAUI/Resources/AppIcon/appiconfg.svg b/AMC.View/Resources/AppIcon/appiconfg.svg
similarity index 100%
rename from AD_MAUI/Resources/AppIcon/appiconfg.svg
rename to AMC.View/Resources/AppIcon/appiconfg.svg
diff --git a/AD_MAUI/Resources/Fonts/OpenSans-Regular.ttf b/AMC.View/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from AD_MAUI/Resources/Fonts/OpenSans-Regular.ttf
rename to AMC.View/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/AD_MAUI/Resources/Fonts/OpenSans-Semibold.ttf b/AMC.View/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from AD_MAUI/Resources/Fonts/OpenSans-Semibold.ttf
rename to AMC.View/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/AD_MAUI/Resources/Images/macroblank.svg b/AMC.View/Resources/Images/macroblank.svg
similarity index 100%
rename from AD_MAUI/Resources/Images/macroblank.svg
rename to AMC.View/Resources/Images/macroblank.svg
diff --git a/AD_MAUI/Resources/Raw/AboutAssets.txt b/AMC.View/Resources/Raw/AboutAssets.txt
similarity index 100%
rename from AD_MAUI/Resources/Raw/AboutAssets.txt
rename to AMC.View/Resources/Raw/AboutAssets.txt
diff --git a/AD_MAUI/Resources/Splash/splash.svg b/AMC.View/Resources/Splash/splash.svg
similarity index 100%
rename from AD_MAUI/Resources/Splash/splash.svg
rename to AMC.View/Resources/Splash/splash.svg
diff --git a/AD_MAUI/Resources/Styles/Colors.xaml b/AMC.View/Resources/Styles/Colors.xaml
similarity index 100%
rename from AD_MAUI/Resources/Styles/Colors.xaml
rename to AMC.View/Resources/Styles/Colors.xaml
diff --git a/AD_MAUI/Resources/Styles/Styles.xaml b/AMC.View/Resources/Styles/Styles.xaml
similarity index 100%
rename from AD_MAUI/Resources/Styles/Styles.xaml
rename to AMC.View/Resources/Styles/Styles.xaml
diff --git a/AD_MAUI/Views/AlbumPage.xaml b/AMC.View/Views/AlbumPage.xaml
similarity index 95%
rename from AD_MAUI/Views/AlbumPage.xaml
rename to AMC.View/Views/AlbumPage.xaml
index 5e7b801..23c6260 100644
--- a/AD_MAUI/Views/AlbumPage.xaml
+++ b/AMC.View/Views/AlbumPage.xaml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:AD_MAUI.ViewModel"
-             x:Class="AD_MAUI.Views.AlbumPage"
-             x:DataType="local:AlbumViewModel">
+             xmlns:local="clr-namespace:AMC.View"
+             xmlns:vm="clr-namespace:AMC.ViewModel;assembly=AMC.ViewModel"
+             x:Class="AMC.View.AlbumPage"
+             x:DataType="vm:AlbumViewModel">
 
     <ScrollView BackgroundColor="{AppThemeBinding Light={StaticResource Background}, Dark={StaticResource BackgroundDark}}">
         <Grid Margin="10">
@@ -72,7 +73,7 @@
                             Margin="0,0,0,16"
                             Grid.Row="4">
                 <CollectionView.ItemTemplate>
-                    <DataTemplate x:DataType="local:SongViewModel">
+                    <DataTemplate x:DataType="vm:SongViewModel">
                         <StackLayout>
                             <Grid Margin="0,8,0,8">
                                 <Grid.ColumnDefinitions>
diff --git a/AD_MAUI/Views/AlbumPage.xaml.cs b/AMC.View/Views/AlbumPage.xaml.cs
similarity index 86%
rename from AD_MAUI/Views/AlbumPage.xaml.cs
rename to AMC.View/Views/AlbumPage.xaml.cs
index 2f92b47..7589a04 100644
--- a/AD_MAUI/Views/AlbumPage.xaml.cs
+++ b/AMC.View/Views/AlbumPage.xaml.cs
@@ -1,6 +1,6 @@
-using AD_MAUI.ViewModel;
+using AMC.ViewModel;
 
-namespace AD_MAUI.Views
+namespace AMC.View
 {
     public partial class AlbumPage : ContentPage
     {
diff --git a/AMC.ViewModel/AMC.ViewModel.csproj b/AMC.ViewModel/AMC.ViewModel.csproj
new file mode 100644
index 0000000..e363d3f
--- /dev/null
+++ b/AMC.ViewModel/AMC.ViewModel.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AMC.Model\AMC.Model.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/AD_MAUI/ViewModel/AlbumViewModel.cs b/AMC.ViewModel/ViewModels/AlbumViewModel.cs
similarity index 98%
rename from AD_MAUI/ViewModel/AlbumViewModel.cs
rename to AMC.ViewModel/ViewModels/AlbumViewModel.cs
index c122091..fd39a36 100644
--- a/AD_MAUI/ViewModel/AlbumViewModel.cs
+++ b/AMC.ViewModel/ViewModels/AlbumViewModel.cs
@@ -1,8 +1,8 @@
-using AD_MAUI.Model;
+using AMC.Model;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 
-namespace AD_MAUI.ViewModel
+namespace AMC.ViewModel
 {
     public class AlbumViewModel : INotifyPropertyChanged
     {
diff --git a/AD_MAUI/ViewModel/SongViewModel.cs b/AMC.ViewModel/ViewModels/SongViewModel.cs
similarity index 89%
rename from AD_MAUI/ViewModel/SongViewModel.cs
rename to AMC.ViewModel/ViewModels/SongViewModel.cs
index 12b17ff..65bce66 100644
--- a/AD_MAUI/ViewModel/SongViewModel.cs
+++ b/AMC.ViewModel/ViewModels/SongViewModel.cs
@@ -1,7 +1,7 @@
-using AD_MAUI.Model;
+using AMC.Model;
 using System.ComponentModel;
 
-namespace AD_MAUI.ViewModel
+namespace AMC.ViewModel
 {
     public class SongViewModel : INotifyPropertyChanged
     {