Tidying up workspace, creating new layers

App/Keychain.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="UI/MainWindow.xml" />
+	  <EmbeddedResource Include="UI/MainWindow/MainWindow.xml" />
   </ItemGroup>
 
 </Project>

App/Program.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace App;
+namespace Keychain;
 
 class Program
 {
@@ -13,7 +13,7 @@ class Program
         var application = Adw.Application.New("org.typomustakes.keychain", Gio.ApplicationFlags.FlagsNone);
         application.OnActivate += (sender, args) =>
         {
-            var window =  new App.UI.MainWindow().Window;
+            var window =  new UI.MainWindow().Window;
             window.Application = (Adw.Application)sender;
             window.Show();
         };
@@ -24,7 +24,7 @@ class Program
     private static ServiceProvider SetupServices()
     {
         var services = new ServiceCollection();
-        services.AddTransient<IPasswordStoreService, PasswordStoreService>();
+        //services.AddTransient<IPasswordStoreService, PasswordStoreService>();
         return services.BuildServiceProvider();
     }
 }

App/UI/MainWindow/MainWindow.cs

@@ -1,7 +1,7 @@
 using Adw;
-using App.UI.ViewModels;
+using Keychain.UI.ViewModels;
 
-namespace App.UI;  
+namespace Keychain.UI;  
   
 public class MainWindow  
 {  
@@ -11,7 +11,7 @@ public class MainWindow
   
     public MainWindow()  
     {  
-        var builder = new Gtk.Builder("App.UI.MainWindow.xml");  
+        var builder = new Gtk.Builder("Keychain.UI.MainWindow.MainWindow.xml");  
 
         var window = builder.GetObject("main_window") as Window;
         if (window == null)

App/UI/ViewModels/PasswordStoreShortcut.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace App.UI.ViewModels;
+namespace Keychain.UI.ViewModels;
 
 public class PasswordStoreShortcut : INotifyPropertyChanged
 {

App/UI/ViewModels/PasswordStoreShortcutCollection.cs

@@ -1,4 +1,4 @@
-namespace App.UI.ViewModels;
+namespace Keychain.UI.ViewModels;
 
 using Adw;
 using Gtk;