Core - Flattened namespaces

Shared UI - Flattened namespaces
Shared UI - General housekeeping
Project - Code cleanup

src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsTabView.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="Artemis.UI.Screens.Settings.Tabs.Devices.DeviceSettingsTabView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.Devices"
              xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:DeviceSettingsTabViewModel}">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0 12 0 0">
@@ -25,4 +25,4 @@
             </ItemsControl>
         </DockPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>

src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsTabViewModel.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Artemis.Core.Services.Storage.Interfaces;
+using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Stylet;
 

src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml

@@ -6,7 +6,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:devices="clr-namespace:Artemis.UI.Screens.Settings.Tabs.Devices"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              d:DataContext="{d:DesignInstance devices:DeviceSettingsViewModel}"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
@@ -30,7 +30,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Rectangle Grid.Row="0" Height="140" Width="196" Fill="{DynamicResource MaterialDesignPaper}" />
-            <controls:DeviceVisualizer Device="{Binding Device}" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="0" Height="130" Width="190" />
+            <shared:DeviceVisualizer Device="{Binding Device}" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="0" Height="130" Width="190" />
             <Button Grid.Row="0"
                     Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
                     HorizontalAlignment="Right"

src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsViewModel.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Diagnostics;
-using Artemis.Core.Models.Surface;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Settings.Debug;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Humanizer;
 using Stylet;
 
@@ -12,10 +11,10 @@ namespace Artemis.UI.Screens.Settings.Tabs.Devices
 {
     public class DeviceSettingsViewModel : PropertyChangedBase
     {
+        private readonly IDeviceDebugVmFactory _deviceDebugVmFactory;
         private readonly IDeviceService _deviceService;
         private readonly IDialogService _dialogService;
         private readonly IWindowManager _windowManager;
-        private readonly IDeviceDebugVmFactory _deviceDebugVmFactory;
         private bool _isDeviceEnabled;
 
         public DeviceSettingsViewModel(ArtemisDevice device, IDeviceService deviceService, IDialogService dialogService,

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml

@@ -1,12 +1,12 @@
 <UserControl x:Class="Artemis.UI.Screens.Settings.Tabs.General.GeneralSettingsTabView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.General"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:GeneralSettingsTabViewModel}">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
@@ -63,7 +63,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Color scheme</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        Pick between a light and dark color scheme, the automatic option copies your Windows settings.
+                                Pick between a light and dark color scheme, the automatic option copies your Windows settings.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -84,7 +84,7 @@
                         <StackPanel Grid.Column="0" VerticalAlignment="Center">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Debugger</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                        Use the debugger to see the raw image Artemis is rendering on the surface.
+                                Use the debugger to see the raw image Artemis is rendering on the surface.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -107,7 +107,7 @@
                         <StackPanel Grid.Column="0" VerticalAlignment="Center">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Application files</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                        Opens the directory where application files like plugins and settings are stored.
+                                Opens the directory where application files like plugins and settings are stored.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -130,7 +130,7 @@
                         <StackPanel Grid.Column="0" VerticalAlignment="Center">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Logs</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
-                                        Opens the directory where logs are stored.
+                                Opens the directory where logs are stored.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -153,7 +153,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Log level</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        Sets the logging level, a higher logging level will result in more log files.
+                                Sets the logging level, a higher logging level will result in more log files.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -180,7 +180,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Show condition data model values</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        While selecting a condition target, show the current values of the data model
+                                While selecting a condition target, show the current values of the data model
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -206,7 +206,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Render scale</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        Sets the resolution Artemis renders at, higher scale means more CPU-usage, especially on large surfaces.
+                                Sets the resolution Artemis renders at, higher scale means more CPU-usage, especially on large surfaces.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -227,7 +227,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Target framerate</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        Sets the FPS Artemis tries to render at, higher FPS means more CPU-usage but smoother animations.
+                                Sets the FPS Artemis tries to render at, higher FPS means more CPU-usage but smoother animations.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -248,7 +248,7 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}">LED sample size</TextBlock>
                             <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
-                                        Sets the amount of samples that is taken to determine each LEDs color. This means a LED can be semi off if it is not completely covered by a color.
+                                Sets the amount of samples that is taken to determine each LEDs color. This means a LED can be semi off if it is not completely covered by a color.
                             </TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -259,4 +259,4 @@
             </materialDesign:Card>
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs

@@ -6,10 +6,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.Core.Utilities;
 using Artemis.UI.Services.Interfaces;
-using Artemis.UI.Shared.Services.Interfaces;
-using Artemis.UI.Shared.Utilities;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Serilog.Events;
 using Stylet;
 
@@ -200,7 +199,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
             try
             {
                 var autoRunFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "Artemis.lnk");
-                var executableFile = CurrentProcessUtilities.GetCurrentLocation();
+                var executableFile = Constants.ExecutablePath;
 
                 if (File.Exists(autoRunFile))
                     File.Delete(autoRunFile);

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderModuleView.xaml

@@ -9,7 +9,7 @@
              d:DataContext="{d:DesignInstance local:ModuleOrderModuleViewModel}">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="40"/>
+            <ColumnDefinition Width="40" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <TextBlock Text="{Binding Priority}"

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderModuleViewModel.cs

@@ -1,5 +1,5 @@
 using System;
-using Artemis.Core.Plugins.Modules;
+using Artemis.Core.Modules;
 using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Tabs.Modules

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabView.xaml

@@ -13,22 +13,22 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <Grid Margin="15" MaxWidth="800">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <StackPanel>
                 <TextBlock TextWrapping="Wrap" Style="{StaticResource MaterialDesignTextBlock}">
-                    Drag and drop the modules below to change their rendering priority. <LineBreak/><LineBreak/>
-                    - Like in the profile editor, the modules at the top render over modules at the bottom <LineBreak/>
-                    - The categories serve as a starting point for new modules, you may freely move modules between the categories <LineBreak/>
+                    Drag and drop the modules below to change their rendering priority. <LineBreak /><LineBreak />
+                    - Like in the profile editor, the modules at the top render over modules at the bottom <LineBreak />
+                    - The categories serve as a starting point for new modules, you may freely move modules between the categories <LineBreak />
                 </TextBlock>
 
                 <Grid Margin="0 0 0 5">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}">1 - Overlays</TextBlock>
                     <TextBlock Grid.Column="1"
@@ -41,17 +41,17 @@
                 </Grid>
                 <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
                     <StackPanel Margin="15">
-                        <Border BorderThickness="2" >
+                        <Border BorderThickness="2">
                             <Border.BorderBrush>
                                 <VisualBrush>
                                     <VisualBrush.Visual>
                                         <Rectangle StrokeDashArray="4 2" Stroke="{DynamicResource MaterialDesignDivider}" StrokeThickness="2"
                                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
-                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"/>
+                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}" />
                                     </VisualBrush.Visual>
                                 </VisualBrush>
                             </Border.BorderBrush>
-                            <ListBox ItemsSource="{Binding OverlayModules}" 
+                            <ListBox ItemsSource="{Binding OverlayModules}"
                                      materialDesign:RippleAssist.IsDisabled="True"
                                      dd:DragDrop.IsDragSource="True"
                                      dd:DragDrop.IsDropTarget="True"
@@ -60,7 +60,7 @@
                                      MinHeight="40">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False"/>
+                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>
@@ -72,8 +72,8 @@
             <StackPanel Grid.Row="1">
                 <Grid Margin="0 15 0 5">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}">2 - Applications/games</TextBlock>
                     <TextBlock Grid.Column="1"
@@ -86,17 +86,17 @@
                 </Grid>
                 <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
                     <StackPanel Margin="15">
-                        <Border BorderThickness="2" >
+                        <Border BorderThickness="2">
                             <Border.BorderBrush>
                                 <VisualBrush>
                                     <VisualBrush.Visual>
                                         <Rectangle StrokeDashArray="4 2" Stroke="{DynamicResource MaterialDesignDivider}" StrokeThickness="2"
                                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
-                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"/>
+                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}" />
                                     </VisualBrush.Visual>
                                 </VisualBrush>
                             </Border.BorderBrush>
-                            <ListBox ItemsSource="{Binding ApplicationModules}" 
+                            <ListBox ItemsSource="{Binding ApplicationModules}"
                                      materialDesign:RippleAssist.IsDisabled="True"
                                      dd:DragDrop.IsDragSource="True"
                                      dd:DragDrop.IsDropTarget="True"
@@ -105,7 +105,7 @@
                                      MinHeight="40">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False"/>
+                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>
@@ -117,8 +117,8 @@
             <StackPanel Grid.Row="2">
                 <Grid Margin="0 15 0 5">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}">3 - Normal</TextBlock>
                     <TextBlock Grid.Column="1"
@@ -131,17 +131,17 @@
                 </Grid>
                 <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
                     <StackPanel Margin="15">
-                        <Border BorderThickness="2" >
+                        <Border BorderThickness="2">
                             <Border.BorderBrush>
                                 <VisualBrush>
                                     <VisualBrush.Visual>
                                         <Rectangle StrokeDashArray="4 2" Stroke="{DynamicResource MaterialDesignDivider}" StrokeThickness="2"
                                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
-                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"/>
+                                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}" />
                                     </VisualBrush.Visual>
                                 </VisualBrush>
                             </Border.BorderBrush>
-                            <ListBox ItemsSource="{Binding NormalModules}" 
+                            <ListBox ItemsSource="{Binding NormalModules}"
                                      materialDesign:RippleAssist.IsDisabled="True"
                                      dd:DragDrop.IsDragSource="True"
                                      dd:DragDrop.IsDropTarget="True"
@@ -150,7 +150,7 @@
                                      MinHeight="40">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
-                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False"/>
+                                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using Artemis.Core.Plugins.Modules;
-using Artemis.Core.Services.Interfaces;
+using Artemis.Core.Modules;
+using Artemis.Core.Services;
 using GongSolutions.Wpf.DragDrop;
 using Stylet;
 
@@ -10,10 +9,10 @@ namespace Artemis.UI.Screens.Settings.Tabs.Modules
 {
     public class ModuleOrderTabViewModel : Screen, IDropTarget
     {
-        private readonly IPluginService _pluginService;
         private readonly IModuleService _moduleService;
-        private List<ModuleOrderModuleViewModel> _modules;
-        private DefaultDropHandler _defaultDropHandler;
+        private readonly IPluginService _pluginService;
+        private readonly DefaultDropHandler _defaultDropHandler;
+        private readonly List<ModuleOrderModuleViewModel> _modules;
 
         public ModuleOrderTabViewModel(IPluginService pluginService, IModuleService moduleService)
         {

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsTabView.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="Artemis.UI.Screens.Settings.Tabs.Plugins.PluginSettingsTabView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.Plugins"
              xmlns:s="https://github.com/canton7/Stylet"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:PluginSettingsTabViewModel}">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0 12 0 0">
@@ -25,4 +25,4 @@
             </ItemsControl>
         </DockPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsTabViewModel.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Artemis.Core.Services.Interfaces;
+using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Stylet;
 

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs

@@ -2,15 +2,14 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
-using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.DataModelExpansions.Internal;
-using Artemis.Core.Plugins.DeviceProviders;
-using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerEffects;
-using Artemis.Core.Plugins.Modules;
-using Artemis.Core.Services.Interfaces;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.Core.DataModelExpansions;
+using Artemis.Core.DeviceProviders;
+using Artemis.Core.LayerBrushes;
+using Artemis.Core.LayerEffects;
+using Artemis.Core.Modules;
+using Artemis.Core.Services;
+using Artemis.UI.Shared.Services;
 using MaterialDesignThemes.Wpf;
 using Ninject;
 using Ninject.Parameters;
@@ -21,13 +20,13 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
     public class PluginSettingsViewModel : PropertyChangedBase
     {
         private readonly IDialogService _dialogService;
+        private readonly IKernel _kernel;
         private readonly IPluginService _pluginService;
         private readonly ISnackbarMessageQueue _snackbarMessageQueue;
-        private readonly IKernel _kernel;
         private readonly IWindowManager _windowManager;
+        private bool _enabling;
         private Plugin _plugin;
         private PluginInfo _pluginInfo;
-        private bool _enabling;
 
         public PluginSettingsViewModel(Plugin plugin,
             IKernel kernel,
@@ -131,7 +130,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
                     return PackIconKind.Devices;
                 case ProfileModule _:
                     return PackIconKind.VectorRectangle;
-                case Core.Plugins.Modules.Module _:
+                case Module _:
                     return PackIconKind.GearBox;
                 case LayerBrushProvider _:
                     return PackIconKind.Brush;

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins;
+using Artemis.Core;
 using MaterialDesignThemes.Wpf;
 using Stylet;
 
@@ -6,8 +6,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
 {
     public class PluginSettingsWindowViewModel : Conductor<PluginConfigurationViewModel>
     {
-        public PackIconKind Icon { get; }
-
         public PluginSettingsWindowViewModel(PluginConfigurationViewModel configurationViewModel, PackIconKind icon)
         {
             Icon = icon;
@@ -16,6 +14,8 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             ActiveItem.Closed += ActiveItemOnClosed;
         }
 
+        public PackIconKind Icon { get; }
+
         private void ActiveItemOnClosed(object? sender, CloseEventArgs e)
         {
             ActiveItem.Closed -= ActiveItemOnClosed;