diff --git a/Saradomin/Infrastructure/Messages.cs b/Saradomin/Infrastructure/Messages.cs
new file mode 100644
index 0000000..dfd432f
--- /dev/null
+++ b/Saradomin/Infrastructure/Messages.cs
@@ -0,0 +1,8 @@
+using Glitonea.Mvvm.Messaging;
+
+namespace Saradomin.Infrastructure
+{
+    public record MainViewLoadedMessage : Message;
+    public record NotificationBoxStateChangedMessage(bool WasOpened) : Message;
+    public record SettingsModifiedMessage(string SettingName) : Message;
+}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs b/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs
deleted file mode 100644
index d67fe32..0000000
--- a/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class MainViewLoadedMessage : Message
-    {
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs b/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs
deleted file mode 100644
index e769deb..0000000
--- a/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class NotificationBoxStateChangedMessage : Message
-    {
-        public bool WasOpened { get; }
-
-        public NotificationBoxStateChangedMessage(bool wasOpened)
-        {
-            WasOpened = wasOpened;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs b/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs
deleted file mode 100644
index 896c9f8..0000000
--- a/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class SettingsModifiedMessage : Message
-    {
-        public string SettingName { get; }
-
-        public SettingsModifiedMessage(string settingName)
-        {
-            SettingName = settingName;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Model/Settings/SettingsComponent.cs b/Saradomin/Model/Settings/SettingsComponent.cs
index 5759efd..165057f 100644
--- a/Saradomin/Model/Settings/SettingsComponent.cs
+++ b/Saradomin/Model/Settings/SettingsComponent.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 
 namespace Saradomin.Model.Settings
 {
diff --git a/Saradomin/View/Windows/MainWindow.axaml b/Saradomin/View/Windows/MainWindow.axaml
index 1d0a530..2bd0aa5 100644
--- a/Saradomin/View/Windows/MainWindow.axaml
+++ b/Saradomin/View/Windows/MainWindow.axaml
@@ -2,7 +2,7 @@
                    xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:controls="clr-namespace:Saradomin.View.Controls"
-                   xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea"
+                   xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
                    xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
                    xmlns:vm="clr-namespace:Saradomin.ViewModel.Windows"
                    DataContext="{mvvm:DataContextSource vm:MainWindowViewModel}"
diff --git a/Saradomin/View/Windows/MainWindow.axaml.cs b/Saradomin/View/Windows/MainWindow.axaml.cs
index 6351c67..9b3728e 100644
--- a/Saradomin/View/Windows/MainWindow.axaml.cs
+++ b/Saradomin/View/Windows/MainWindow.axaml.cs
@@ -1,11 +1,8 @@
 using System;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
-using Glitonea.Mvvm.Messaging;
 using PropertyChanged;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 
 namespace Saradomin.View.Windows
 {
diff --git a/Saradomin/View/Windows/NotificationBox.axaml b/Saradomin/View/Windows/NotificationBox.axaml
index ac46631..7d5dda8 100644
--- a/Saradomin/View/Windows/NotificationBox.axaml
+++ b/Saradomin/View/Windows/NotificationBox.axaml
@@ -1,7 +1,7 @@
 <glitonea:WindowEx x:Class="Saradomin.View.Windows.NotificationBox"
                    xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                   xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea"
+                   xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
                    xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
                    xmlns:windows="clr-namespace:Saradomin.ViewModel.Windows"
                    Title="{Binding Title}"
diff --git a/Saradomin/View/Windows/NotificationBox.axaml.cs b/Saradomin/View/Windows/NotificationBox.axaml.cs
index a974693..3c384fe 100644
--- a/Saradomin/View/Windows/NotificationBox.axaml.cs
+++ b/Saradomin/View/Windows/NotificationBox.axaml.cs
@@ -2,10 +2,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
-using Glitonea;
+using Glitonea.Controls;
 using Glitonea.Extensions;
 using PropertyChanged;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 
 namespace Saradomin.View.Windows
 {
diff --git a/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs b/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
index c037cb1..7953bac 100644
--- a/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
+++ b/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Glitonea.Mvvm;
 using Glitonea.Mvvm.Messaging;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 using Saradomin.Infrastructure.Services;
 using Saradomin.Model;
 using Saradomin.View.Windows;
diff --git a/Saradomin/ViewModel/Controls/SettingsViewModel.cs b/Saradomin/ViewModel/Controls/SettingsViewModel.cs
index 057d718..a26d74a 100644
--- a/Saradomin/ViewModel/Controls/SettingsViewModel.cs
+++ b/Saradomin/ViewModel/Controls/SettingsViewModel.cs
@@ -3,18 +3,16 @@ using System.Collections.ObjectModel;
 using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using Glitonea.Extensions;
 using Glitonea.Mvvm;
 using Glitonea.Mvvm.Messaging;
 using Glitonea.Utilities;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 using Saradomin.Infrastructure.Services;
 using Saradomin.Model.Settings.Client;
 using Saradomin.Model.Settings.Launcher;
 using Saradomin.Utilities;
-using Saradomin.View.Windows;
 
 namespace Saradomin.ViewModel.Controls
 {
@@ -79,12 +77,12 @@ namespace Saradomin.ViewModel.Controls
         
         public async Task BrowseForJavaExecutable()
         {
-            var window = Application.Current.GetMainWindow();
+            var window = Application.Current!.GetMainWindow();
             var pickerOptions = new FilePickerOpenOptions
             {
                 Title = "Browse for Java...",
                 AllowMultiple = false,
-                SuggestedStartLocation =await window.StorageProvider.TryGetFolderFromPathAsync(
+                SuggestedStartLocation =await window!.StorageProvider.TryGetFolderFromPathAsync(
                     Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
                 )
             };
diff --git a/Saradomin/ViewModel/Windows/MainWindowViewModel.cs b/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
index 082d5ff..96326ed 100644
--- a/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
+++ b/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
@@ -9,7 +9,7 @@ using Avalonia.Metadata;
 using Glitonea.Mvvm;
 using Glitonea.Mvvm.Messaging;
 using HtmlAgilityPack;
-using Saradomin.Infrastructure.Messaging;
+using Saradomin.Infrastructure;
 using Saradomin.Infrastructure.Services;
 using Saradomin.Model.Settings.Launcher;
 using Saradomin.Utilities;