diff --git a/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs b/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs
index 39651d56f..2c1becd98 100644
--- a/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs
+++ b/src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs
@@ -25,8 +25,6 @@ namespace Artemis.Core.Plugins.Abstract
         {
             if (sender.GetType().IsGenericType(type))
             {
-                Debug.WriteLine(e.RelativePart);
-                Debug.WriteLine(e.FileName);
                 // Start from the plugin directory
                 if (e.RelativePart != null && e.FileName != null)
                     e.FinalPath = Path.Combine(PluginInfo.Directory.FullName, e.RelativePart, e.FileName);
diff --git a/src/Artemis.Core/Plugins/Abstract/Module.cs b/src/Artemis.Core/Plugins/Abstract/Module.cs
index 67b8e5f97..2c69f9d4e 100644
--- a/src/Artemis.Core/Plugins/Abstract/Module.cs
+++ b/src/Artemis.Core/Plugins/Abstract/Module.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Artemis.Core.Models.Surface;
+using Artemis.Core.Plugins.Abstract.ViewModels;
 using Artemis.Core.Plugins.Models;
 using SkiaSharp;
 
diff --git a/src/Artemis.Core/Plugins/Abstract/Plugin.cs b/src/Artemis.Core/Plugins/Abstract/Plugin.cs
index 3e34fcccb..711275ea5 100644
--- a/src/Artemis.Core/Plugins/Abstract/Plugin.cs
+++ b/src/Artemis.Core/Plugins/Abstract/Plugin.cs
@@ -1,4 +1,5 @@
 using System;
+using Artemis.Core.Plugins.Abstract.ViewModels;
 using Artemis.Core.Plugins.Models;
 
 namespace Artemis.Core.Plugins.Abstract
@@ -16,6 +17,12 @@ namespace Artemis.Core.Plugins.Abstract
 
         public PluginInfo PluginInfo { get; internal set; }
 
+        /// <summary>
+        ///     Gets or sets whether this plugin has a configuration view model.
+        ///     If set to true, <see cref="GetConfigurationViewModel" /> will be called when the plugin is configured from the UI.
+        /// </summary>
+        public bool HasConfigurationViewModel { get; protected set; }
+
         /// <inheritdoc />
         /// <summary>
         ///     Called when the plugin is unloaded, clean up any unmanaged resources here
@@ -31,5 +38,15 @@ namespace Artemis.Core.Plugins.Abstract
         ///     Called when the plugin is deactivated
         /// </summary>
         public abstract void DisablePlugin();
+
+        /// <summary>
+        ///     Called when the plugin's configuration window is opened from the UI. The UI will only attempt to open if
+        ///     <see cref="HasConfigurationViewModel" /> is set to True.
+        /// </summary>
+        /// <returns></returns>
+        public virtual PluginConfigurationViewModel GetConfigurationViewModel()
+        {
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Plugins/Abstract/ModuleViewModel.cs b/src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs
similarity index 84%
rename from src/Artemis.Core/Plugins/Abstract/ModuleViewModel.cs
rename to src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs
index 809960d57..b1d599d36 100644
--- a/src/Artemis.Core/Plugins/Abstract/ModuleViewModel.cs
+++ b/src/Artemis.Core/Plugins/Abstract/ViewModels/ModuleViewModel.cs
@@ -1,6 +1,6 @@
 using Stylet;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.Abstract.ViewModels
 {
     public abstract class ModuleViewModel : Screen
     {
diff --git a/src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs b/src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs
new file mode 100644
index 000000000..faa749601
--- /dev/null
+++ b/src/Artemis.Core/Plugins/Abstract/ViewModels/PluginConfigurationViewModel.cs
@@ -0,0 +1,14 @@
+using Stylet;
+
+namespace Artemis.Core.Plugins.Abstract.ViewModels
+{
+    public abstract class PluginConfigurationViewModel : Screen
+    {
+        protected PluginConfigurationViewModel(Plugin plugin)
+        {
+            Plugin = plugin;
+        }
+
+        public Plugin Plugin { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.Core/Plugins/Models/PluginInfo.cs b/src/Artemis.Core/Plugins/Models/PluginInfo.cs
index 3c070b2c2..9c9bcd414 100644
--- a/src/Artemis.Core/Plugins/Models/PluginInfo.cs
+++ b/src/Artemis.Core/Plugins/Models/PluginInfo.cs
@@ -25,6 +25,11 @@ namespace Artemis.Core.Plugins.Models
         [JsonProperty(Required = Required.Always)]
         public string Name { get; internal set; }
 
+        /// <summary>
+        ///     A short description of the plugin
+        /// </summary>
+        public string Description { get; set; }
+
         /// <summary>
         ///     The version of the plugin
         /// </summary>
@@ -62,7 +67,7 @@ namespace Artemis.Core.Plugins.Models
         internal PluginLoader PluginLoader { get; set; }
 
         /// <summary>
-        /// The assembly the plugin code lives in
+        ///     The assembly the plugin code lives in
         /// </summary>
         [JsonIgnore]
         internal Assembly Assembly { get; set; }
diff --git a/src/Artemis.Core/Services/Interfaces/IRgbService.cs b/src/Artemis.Core/Services/Interfaces/IRgbService.cs
index 19ca009a7..f6b74dead 100644
--- a/src/Artemis.Core/Services/Interfaces/IRgbService.cs
+++ b/src/Artemis.Core/Services/Interfaces/IRgbService.cs
@@ -28,7 +28,18 @@ namespace Artemis.Core.Services.Interfaces
         /// </summary>
         IReadOnlyCollection<IRGBDevice> LoadedDevices { get; }
 
+        /// <summary>
+        ///     Adds the given device provider to the <see cref="Surface" />
+        /// </summary>
+        /// <param name="deviceProvider"></param>
         void AddDeviceProvider(IRGBDeviceProvider deviceProvider);
+
+        /// <summary>
+        ///     Removes the given device provider from the <see cref="Surface" /> by recreating it without the device provider
+        /// </summary>
+        /// <param name="deviceProvider"></param>
+        void RemoveDeviceProvider(IRGBDeviceProvider deviceProvider);
+
         void Dispose();
 
         /// <summary>
diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs
index 10fa534fe..c7911ecfa 100644
--- a/src/Artemis.Core/Services/RgbService.cs
+++ b/src/Artemis.Core/Services/RgbService.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Artemis.Core.Events;
+using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.RGB.NET;
 using Artemis.Core.Services.Interfaces;
@@ -16,13 +18,14 @@ namespace Artemis.Core.Services
     public class RgbService : IRgbService, IDisposable
     {
         private readonly List<IRGBDevice> _loadedDevices;
+        private readonly List<IRGBDeviceProvider> _loadedDeviceProviders;
         private readonly ILogger _logger;
         private readonly PluginSetting<double> _renderScaleSetting;
         private readonly PluginSetting<int> _sampleSizeSetting;
         private readonly PluginSetting<int> _targetFrameRateSetting;
         private readonly TimerUpdateTrigger _updateTrigger;
         private ListLedGroup _surfaceLedGroup;
-
+        
         internal RgbService(ILogger logger, ISettingsService settingsService)
         {
             _logger = logger;
@@ -37,6 +40,7 @@ namespace Artemis.Core.Services
             _renderScaleSetting.SettingChanged += RenderScaleSettingOnSettingChanged;
             _targetFrameRateSetting.SettingChanged += TargetFrameRateSettingOnSettingChanged;
             _loadedDevices = new List<IRGBDevice>();
+            _loadedDeviceProviders = new List<IRGBDeviceProvider>();
             _updateTrigger = new TimerUpdateTrigger {UpdateFrequency = 1.0 / _targetFrameRateSetting.Value};
             Surface.RegisterUpdateTrigger(_updateTrigger);
         }
@@ -52,7 +56,11 @@ namespace Artemis.Core.Services
 
         public void AddDeviceProvider(IRGBDeviceProvider deviceProvider)
         {
+            if (_loadedDeviceProviders.Contains(deviceProvider))
+                return;
+
             Surface.LoadDevices(deviceProvider);
+            _loadedDeviceProviders.Add(deviceProvider);
 
             if (deviceProvider.Devices == null)
             {
@@ -72,6 +80,12 @@ namespace Artemis.Core.Services
             }
         }
 
+        public void RemoveDeviceProvider(IRGBDeviceProvider deviceProvider)
+        {
+            if (!_loadedDeviceProviders.Contains(deviceProvider))
+                return;
+        }
+
         public void Dispose()
         {
             Surface.UnregisterUpdateTrigger(_updateTrigger);
diff --git a/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
index 26103229a..09e40501e 100644
--- a/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
+++ b/src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml
@@ -15,9 +15,10 @@
 
         <Separator Margin="0 15" />
         <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" FontWeight="Bold" Margin="22 0">Exception message</TextBlock>
-        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Text="{Binding Exception.Message}" TextWrapping="Wrap" Margin="22 5" />
+        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" HorizontalAlignment="Left" Text="{Binding Exception.Message}" TextWrapping="Wrap" Margin="22 5" MaxWidth="1000" />
         <Separator Margin="0 15" />
         <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Text="Stack trace" TextWrapping="Wrap" FontWeight="Bold" Margin="22 0" />
+
         <avalonedit:TextEditor SyntaxHighlighting="C#"
                                FontFamily="pack://application:,,,/Resources/Fonts/#Roboto Mono"
                                FontSize="10pt"
@@ -25,6 +26,7 @@
                                Document="{Binding Document}"
                                HorizontalScrollBarVisibility="Auto"
                                VerticalScrollBarVisibility="Auto"
+                               MaxWidth="1000"
                                Margin="0 10" />
 
 
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index c1c5f170a..304fb6540 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -34,6 +34,12 @@
   <Target Name="RemoveTranslationsAfterBuild" AfterTargets="AfterBuild">
     <RemoveDir Directories="@(FluentValidationExcludedCultures->'$(OutputPath)%(Filename)')" />
   </Target>
+  <ItemGroup>
+    <Compile Remove="publish\**" />
+    <EmbeddedResource Remove="publish\**" />
+    <None Remove="publish\**" />
+    <Page Remove="publish\**" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="RGB.NET.Core, Version=0.1.25.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll</HintPath>
diff --git a/src/Artemis.UI/Screens/News/NewsView.xaml b/src/Artemis.UI/Screens/News/NewsView.xaml
index 381d8fa51..87b64cd38 100644
--- a/src/Artemis.UI/Screens/News/NewsView.xaml
+++ b/src/Artemis.UI/Screens/News/NewsView.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="16">
-        <materialDesign:PackIcon Kind="CodeNotEqual" Width="250" Height="250" HorizontalAlignment="Center" />
+        <materialDesign:PackIcon Kind="Crane" Width="250" Height="250" HorizontalAlignment="Center" />
         <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 25">
             News is not yet implemented
         </TextBlock>
diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.xaml b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
index 25423ff05..51470170b 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsView.xaml
+++ b/src/Artemis.UI/Screens/Settings/SettingsView.xaml
@@ -39,7 +39,7 @@
                                     <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Start up with Windows</TextBlock>
                                 </StackPanel>
                                 <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartWithWindows}"/>
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartWithWindows}" />
                                 </StackPanel>
                             </Grid>
                             <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
@@ -57,7 +57,7 @@
                                     <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Start up with Windows minimized</TextBlock>
                                 </StackPanel>
                                 <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartMinimized}" IsEnabled="{Binding StartWithWindows}"/>
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding StartMinimized}" IsEnabled="{Binding StartWithWindows}" />
                                 </StackPanel>
                             </Grid>
                             <Separator Style="{StaticResource MaterialDesignSeparator}" Margin="-15 5" />
@@ -226,7 +226,7 @@
         </TabItem>
         <TabItem Header="PLUGINS" TextElement.Foreground="{DynamicResource MaterialDesignBody}">
             <DockPanel Margin="15">
-                <TextBlock DockPanel.Dock="Top">The list below shows all loaded plugins. You can't really edit it right now. If you're missing something, view your logs folder.</TextBlock>
+                <TextBlock DockPanel.Dock="Top">The list below shows all loaded plugins. If you're missing something, view your logs folder.</TextBlock>
                 <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                     <DataGrid Margin="0 8 0 0"
                               ItemsSource="{Binding Plugins}"
@@ -240,6 +240,15 @@
                             <DataGridTextColumn Binding="{Binding Name}" Header="Name" IsReadOnly="True" Width="*" />
                             <DataGridTextColumn Binding="{Binding Description}" Header="Description" IsReadOnly="True" Width="*" />
                             <DataGridTextColumn Binding="{Binding Version}" Header="Version" IsReadOnly="True" />
+                            <DataGridTemplateColumn>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate >
+                                        <Button Style="{StaticResource MaterialDesignOutlinedButton}" s:View.ActionTarget="{Binding}" Command="{s:Action OpenSettings}">
+                                            CONFIGURE
+                                        </Button>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
                             <DataGridCheckBoxColumn Header="Enabled"
                                                     Binding="{Binding IsEnabled}"
                                                     ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}"
diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
index 171872761..7d16ce5f6 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
@@ -189,7 +189,7 @@ namespace Artemis.UI.Screens.Settings
             // TODO: GetPluginsOfType isn't ideal here as it doesn't include disabled plugins
             Plugins.Clear();
             foreach (var plugin in _pluginService.GetPluginsOfType<Plugin>())
-                Plugins.Add(new PluginSettingsViewModel(plugin));
+                Plugins.Add(new PluginSettingsViewModel(plugin, _windowManager, _dialogService));
 
             base.OnInitialActivate();
         }
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs
index d10405a31..967324e6a 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs
@@ -1,23 +1,46 @@
 using System;
+using System.Threading.Tasks;
 using Artemis.Core.Plugins.Abstract;
+using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Tabs.Plugins
 {
     public class PluginSettingsViewModel : PropertyChangedBase
     {
+        private readonly IDialogService _dialogService;
         private readonly Plugin _plugin;
+        private readonly IWindowManager _windowManager;
 
-        public PluginSettingsViewModel(Plugin plugin)
+        public PluginSettingsViewModel(Plugin plugin, IWindowManager windowManager, IDialogService dialogService)
         {
             _plugin = plugin;
+            _windowManager = windowManager;
+            _dialogService = dialogService;
             IsEnabled = true;
         }
 
         public string Type => _plugin.GetType().BaseType?.Name ?? _plugin.GetType().Name;
         public string Name => _plugin.PluginInfo.Name;
-        public string Description => "N.Y.I.";
+        public string Description => _plugin.PluginInfo.Description;
         public Version Version => _plugin.PluginInfo.Version;
         public bool IsEnabled { get; set; }
+
+        public bool CanOpenSettings => IsEnabled && _plugin.HasConfigurationViewModel;
+
+        public async Task OpenSettings()
+        {
+            try
+            {
+                var configurationViewModel = _plugin.GetConfigurationViewModel();
+                if (configurationViewModel != null)
+                    _windowManager.ShowDialog(new PluginSettingsWindowViewModel(configurationViewModel));
+            }
+            catch (Exception e)
+            {
+                await _dialogService.ShowExceptionDialog("An exception occured while trying to show the plugin's settings window", e);
+                throw;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml
new file mode 100644
index 000000000..b29094cb5
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowView.xaml
@@ -0,0 +1,23 @@
+<controls:MaterialWindow x:Class="Artemis.UI.Screens.Settings.Tabs.Plugins.PluginSettingsWindowView"
+                    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:local="clr-namespace:Artemis.UI.Screens.Settings.Tabs.Plugins"
+                    xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
+                    xmlns:s="https://github.com/canton7/Stylet"
+                    mc:Ignorable="d"
+                    Title="{Binding Title}"
+                    Background="{DynamicResource MaterialDesignPaper}"
+                    FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
+                    UseLayoutRounding="True"
+                    Width="800"
+                    Height="800"
+                    d:DesignHeight="800"
+                    d:DesignWidth="800"
+                    d:DataContext="{d:DesignInstance local:PluginSettingsWindowViewModel}"
+                    Icon="/Resources/Images/Logo/logo-512.png">
+    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+        <ContentControl s:View.Model="{Binding ActiveItem}"/>
+    </ScrollViewer>
+</controls:MaterialWindow>
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs
new file mode 100644
index 000000000..1208db06d
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsWindowViewModel.cs
@@ -0,0 +1,15 @@
+using Artemis.Core.Plugins.Abstract.ViewModels;
+using Stylet;
+
+namespace Artemis.UI.Screens.Settings.Tabs.Plugins
+{
+    public class PluginSettingsWindowViewModel : Conductor<PluginConfigurationViewModel>
+    {
+        public PluginSettingsWindowViewModel(PluginConfigurationViewModel configurationViewModel)
+        {
+            ActiveItem = configurationViewModel;
+        }
+
+        public string Title => "Plugin configuration - " + ActiveItem?.Plugin?.PluginInfo?.Name;
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.sln b/src/Artemis.sln
index ced090c6d..30e464c16 100644
--- a/src/Artemis.sln
+++ b/src/Artemis.sln
@@ -5,6 +5,9 @@ VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI", "Artemis.UI\Artemis.UI.csproj", "{46B74153-77CF-4489-BDF9-D53FDB1F7ACB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AB80F106-5444-46AA-A255-F765DD2F04F1} = {AB80F106-5444-46AA-A255-F765DD2F04F1}
+		{8DC7960F-6DDF-4007-A155-17E124F39374} = {8DC7960F-6DDF-4007-A155-17E124F39374}
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC} = {DCF7C321-95DC-4507-BB61-A7C5356E58EC}
 		{E592F239-FAA0-4840-9C85-46E5867D06D5} = {E592F239-FAA0-4840-9C85-46E5867D06D5}
 		{0F288A66-6EB0-4589-8595-E33A3A3EAEA2} = {0F288A66-6EB0-4589-8595-E33A3A3EAEA2}
 		{7F4C7AB0-4C9B-452D-AFED-34544C903DEF} = {7F4C7AB0-4C9B-452D-AFED-34544C903DEF}
@@ -19,19 +22,37 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Core", "Artemis.Cor
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{E830A02B-A7E5-4A6B-943F-76B0A542630C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Modules.General", "Artemis.Plugins.Modules.General\Artemis.Plugins.Modules.General.csproj", "{E592F239-FAA0-4840-9C85-46E5867D06D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Modules.General", "Plugins\Artemis.Plugins.Modules.General\Artemis.Plugins.Modules.General.csproj", "{E592F239-FAA0-4840-9C85-46E5867D06D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Color", "Artemis.Plugins.LayerBrushes.Color\Artemis.Plugins.LayerBrushes.Color.csproj", "{0F288A66-6EB0-4589-8595-E33A3A3EAEA2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Color", "Plugins\Artemis.Plugins.LayerBrushes.Color\Artemis.Plugins.LayerBrushes.Color.csproj", "{0F288A66-6EB0-4589-8595-E33A3A3EAEA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Corsair", "Artemis.Plugins.Devices.Corsair\Artemis.Plugins.Devices.Corsair.csproj", "{A779B2F8-C253-4C4B-8634-6EB8F594E96D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Corsair", "Plugins\Artemis.Plugins.Devices.Corsair\Artemis.Plugins.Devices.Corsair.csproj", "{A779B2F8-C253-4C4B-8634-6EB8F594E96D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Logitech", "Artemis.Plugins.Devices.Logitech\Artemis.Plugins.Devices.Logitech.csproj", "{235A45C7-24AD-4F47-B9D4-CD67E610A04D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Logitech", "Plugins\Artemis.Plugins.Devices.Logitech\Artemis.Plugins.Devices.Logitech.csproj", "{235A45C7-24AD-4F47-B9D4-CD67E610A04D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Noise", "Artemis.Plugins.LayerBrushes.Noise\Artemis.Plugins.LayerBrushes.Noise.csproj", "{7F4C7AB0-4C9B-452D-AFED-34544C903DEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.LayerBrushes.Noise", "Plugins\Artemis.Plugins.LayerBrushes.Noise\Artemis.Plugins.LayerBrushes.Noise.csproj", "{7F4C7AB0-4C9B-452D-AFED-34544C903DEF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI.Shared", "Artemis.UI.Shared\Artemis.UI.Shared.csproj", "{ADB357E6-151D-4D0D-87CB-68FD0BC29812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Wooting", "Artemis.Plugins.Devices.Wooting\Artemis.Plugins.Devices.Wooting.csproj", "{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Wooting", "Plugins\Artemis.Plugins.Devices.Wooting\Artemis.Plugins.Devices.Wooting.csproj", "{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Asus", "Plugins\Artemis.Plugins.Devices.Asus\Artemis.Plugins.Devices.Asus.csproj", "{DCF7C321-95DC-4507-BB61-A7C5356E58EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.CoolerMaster", "Plugins\Artemis.Plugins.Devices.CoolerMaster\Artemis.Plugins.Devices.CoolerMaster.csproj", "{8DC7960F-6DDF-4007-A155-17E124F39374}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.DMX", "Plugins\Artemis.Plugins.Devices.DMX\Artemis.Plugins.Devices.DMX.csproj", "{AB80F106-5444-46AA-A255-F765DD2F04F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Msi", "Plugins\Artemis.Plugins.Devices.Msi\Artemis.Plugins.Devices.Msi.csproj", "{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Novation", "Plugins\Artemis.Plugins.Devices.Novation\Artemis.Plugins.Devices.Novation.csproj", "{D004FEC9-0CF8-4828-B620-95DBA73201A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Razer", "Plugins\Artemis.Plugins.Devices.Razer\Artemis.Plugins.Devices.Razer.csproj", "{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.Roccat", "Plugins\Artemis.Plugins.Devices.Roccat\Artemis.Plugins.Devices.Roccat.csproj", "{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.SteelSeries", "Plugins\Artemis.Plugins.Devices.SteelSeries\Artemis.Plugins.Devices.SteelSeries.csproj", "{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Devices.WS281X", "Plugins\Artemis.Plugins.Devices.WS281X\Artemis.Plugins.Devices.WS281X.csproj", "{A46F278A-FC2C-4342-8455-994D957DDA03}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,8 +72,8 @@ Global
 		{46B74153-77CF-4489-BDF9-D53FDB1F7ACB}.Release|x64.Build.0 = Release|Any CPU
 		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.ActiveCfg = Debug|x64
-		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.Build.0 = Debug|x64
+		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|x64.ActiveCfg = Release|x64
@@ -121,6 +142,78 @@ Global
 		{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6BDB6D9-062D-4C28-A280-F3BD6197F07F}.Release|x64.Build.0 = Release|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC}.Release|x64.Build.0 = Release|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Debug|x64.Build.0 = Debug|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Release|x64.ActiveCfg = Release|Any CPU
+		{8DC7960F-6DDF-4007-A155-17E124F39374}.Release|x64.Build.0 = Release|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{AB80F106-5444-46AA-A255-F765DD2F04F1}.Release|x64.Build.0 = Release|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA}.Release|x64.Build.0 = Release|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3}.Release|x64.Build.0 = Release|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Debug|x64.Build.0 = Debug|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Release|x64.ActiveCfg = Release|Any CPU
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D}.Release|x64.Build.0 = Release|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Debug|x64.Build.0 = Debug|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Release|x64.ActiveCfg = Release|Any CPU
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA}.Release|x64.Build.0 = Release|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29}.Release|x64.Build.0 = Release|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Debug|x64.Build.0 = Debug|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Release|x64.ActiveCfg = Release|Any CPU
+		{A46F278A-FC2C-4342-8455-994D957DDA03}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -132,6 +225,15 @@ Global
 		{235A45C7-24AD-4F47-B9D4-CD67E610A04D} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
 		{7F4C7AB0-4C9B-452D-AFED-34544C903DEF} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
 		{C6BDB6D9-062D-4C28-A280-F3BD6197F07F} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{DCF7C321-95DC-4507-BB61-A7C5356E58EC} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{8DC7960F-6DDF-4007-A155-17E124F39374} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{AB80F106-5444-46AA-A255-F765DD2F04F1} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{07678400-2FE1-4C6E-A8D4-4F9F3C0630EA} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{D004FEC9-0CF8-4828-B620-95DBA73201A3} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{36C10640-A31F-4DEE-9F0E-9B9E3F12753D} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{26902C94-3EBC-4132-B7F0-FFCAB8E150DA} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{FA5815D3-EA87-4A64-AD6C-A5AE96C61F29} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
+		{A46F278A-FC2C-4342-8455-994D957DDA03} = {E830A02B-A7E5-4A6B-943F-76B0A542630C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C203080A-4473-4CC2-844B-F552EA43D66A}
diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj b/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj
new file mode 100644
index 000000000..2beab7559
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Asus/Artemis.Plugins.Devices.Asus.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="x64\**" />
+    <Compile Remove="x86\**" />
+    <EmbeddedResource Remove="x64\**" />
+    <EmbeddedResource Remove="x86\**" />
+    <None Remove="x64\**" />
+    <None Remove="x86\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Asus">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Asus.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs
new file mode 100644
index 000000000..30db6dfad
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Asus/AsusDeviceProvider.cs
@@ -0,0 +1,37 @@
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.Asus;
+
+namespace Artemis.Plugins.Devices.Asus
+{
+    // ReSharper disable once UnusedMember.Global
+    public class AsusDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public AsusDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.Asus.AsusDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(AsusRGBDevice<>), sender, args);
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // AsusDeviceProvider.Instance.ResetDevices();
+            // AsusDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/Images/Asus/Mainboards/PRIMEX370-PRO.png b/src/Plugins/Artemis.Plugins.Devices.Asus/Images/Asus/Mainboards/PRIMEX370-PRO.png
new file mode 100644
index 000000000..59a8d13ec
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Asus/Images/Asus/Mainboards/PRIMEX370-PRO.png differ
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/empty.png b/src/Plugins/Artemis.Plugins.Devices.Asus/Images/Asus/empty.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/empty.png
rename to src/Plugins/Artemis.Plugins.Devices.Asus/Images/Asus/empty.png
diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/Layouts/Asus/Mainboards/PRIMEX370-PRO.xml b/src/Plugins/Artemis.Plugins.Devices.Asus/Layouts/Asus/Mainboards/PRIMEX370-PRO.xml
new file mode 100644
index 000000000..ad9c37831
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Asus/Layouts/Asus/Mainboards/PRIMEX370-PRO.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Asus Prime X370-PRO</Name>
+  <Description>Asus Prime X370-PRO Mainboard</Description>
+  <Author>Darth Affe</Author>
+  <Type>Mainboard</Type>
+  <Lighting>Key</Lighting>
+  <Vendor>Asus</Vendor>
+  <Model>Prime X370-PRO</Model>
+  <Width>252</Width>
+  <Height>305</Height>
+  <ImageBasePath>Images\Asus\Mainboards</ImageBasePath>
+  <DeviceImage>PRIMEX370-PRO.png</DeviceImage>
+  <Leds>
+    <Led Id="Mainboard1">
+      <X>0</X>
+      <Y>131</Y>
+      <Width>35mm</Width>
+      <Height>57mm</Height>
+      <Shape>M 0,0 L 0,1 L 0.325,1 L 0.325,0 Z   M 0.862,0 L 0.822,0.06 L 0.904,0.11 L 0.91,0.505 L 0.86,0.532 L 0.74,0.532 L 0.6575,0.485 L 0.54,0.485 L 0.425,0.55 L 0.425,0.64 L0.44,0.66 L0.44,0.755 L 0.4,0.78 L 0.4,1  L 0.5,1 L 0.5,0.805 L 0.53,0.785 L 0.53,0.6325 L 0.515,0.6225 L 0.515,0.575 L 0.575,0.543 L 0.6225,0.543 L 0.705,0.59 L 0.9,0.59 L 1,0.525 L 1,0.08 Z</Shape>
+    </Led>
+    <Led Id="Mainboard2">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>17mm</Width>
+      <Height>40mm</Height>
+      <Shape>M 0.83,0 L 0.83,1 L1,1 L 1,0 Z   M 0,0 L 0,1 L 0.6691,1 L 0.6691,0 Z</Shape>
+    </Led>
+    <Led Id="Mainboard3">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>44mm</Width>
+      <Height>41mm</Height>
+      <Shape>
+        M 0,0 L 0,1 L 0.26,1 L 0.26,0 Z   M 0.32,0 L 0.32,0.29 L 0.365,0.325 L 0.395,0.325 L 0.395,0.36 L 0.455,0.41  L 0.49,0.345 L 0.4675,0.32 L 0.455,0.2475 L 0.4675,0.26 L 0.395,0.2475 L 0.395,0 Z
+        M 0.935,0.715 L 0.935,0.84 L 0.865,0.915 L 0.865,1  L 0.9375,1 L 0.9375,0.95 L 1,0.88 L 1,0.715 Z
+      </Shape>
+    </Led>
+    <Led Id="Mainboard4">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>68mm</Width>
+      <Height>35mm</Height>
+      <Shape>M 0,0 L 0,1 L 0.94,1 L 0.94,0.95 L 0.206,0.95 Q 0.168,0.95 0.165,0.875 L 0.165,0 Z   M 0.55,0.019 L 0.55,0.132 L 0.578,0.19 L 0.578,0.2078 L 0.612,0.271 L 0.612,0.6625 L 0.635,0.7125 L0.735,0.7125 L0.755,0.75 L 0.915,0.75 L 0.92,0.76 L 0.942,0.76 L 0.94,1  L 0.99,1 L 0.99,0.72 L 0.965,0.67 L 0.935,0.67 L 0.93,0.66 L 0.772,0.66 L 0.752,0.62 L 0.66,0.62 L 0.66,0.237 L 0.622,0.16 L 0.622,0.145 L 0.5975,0.095 L 0.5975,0.019 Z</Shape>
+    </Led>
+    <Led Id="Mainboard5">
+      <X>80</X>
+      <Y>132</Y>
+      <Width>5mm</Width>
+      <Height>13mm</Height>
+    </Led>
+  </Leds>
+</Device>
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Asus/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.Devices.Asus/Properties/AssemblyInfo.cs
diff --git a/src/Artemis.Plugins.Devices.Logitech/app.config b/src/Plugins/Artemis.Plugins.Devices.Asus/app.config
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/app.config
rename to src/Plugins/Artemis.Plugins.Devices.Asus/app.config
diff --git a/src/Plugins/Artemis.Plugins.Devices.Asus/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Asus/plugin.json
new file mode 100644
index 000000000..d66dbe00d
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Asus/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "c20e876f-7cb0-4fa1-b0cc-ae1afb5865d1",
+  "Name": "Asus Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.Asus.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj
new file mode 100644
index 000000000..73d670915
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Artemis.Plugins.Devices.CoolerMaster.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.CoolerMaster">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.CoolerMaster.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
new file mode 100644
index 000000000..d3ae2747e
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.CoolerMaster;
+
+namespace Artemis.Plugins.Devices.CoolerMaster
+{
+    // ReSharper disable once UnusedMember.Global
+    public class CoolerMasterDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public CoolerMasterDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.CoolerMaster.CoolerMasterDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(CoolerMasterRGBDevice<>), sender, args);
+            RGB.NET.Devices.CoolerMaster.CoolerMasterDeviceProvider.PossibleX64NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x64", "CMSDK.dll"));
+            RGB.NET.Devices.CoolerMaster.CoolerMasterDeviceProvider.PossibleX86NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x86", "CMSDK.dll"));
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // CoolerMasterDeviceProvider.Instance.ResetDevices();
+            // CoolerMasterDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Artemis.Plugins.Devices.Wooting/app.config b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/app.config
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/app.config
rename to src/Plugins/Artemis.Plugins.Devices.CoolerMaster/app.config
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/plugin.json b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/plugin.json
new file mode 100644
index 000000000..1d8cf427f
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "b78f644b-827f-4bb4-bf03-2adaa365b58b",
+  "Name": "CoolerMaster Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.CoolerMaster.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll
new file mode 100644
index 000000000..a51402d42
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x64/CMSDK.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll
new file mode 100644
index 000000000..7e27becee
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.CoolerMaster/x86/CMSDK.dll differ
diff --git a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj b/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
similarity index 84%
rename from src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
index 734e06bbd..0e5a6f285 100644
--- a/src/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
+++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/Artemis.Plugins.Devices.Corsair.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>Artemis.Plugins.Devices.CorsairDevice</AssemblyTitle>
@@ -7,6 +7,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <LangVersion>7.3</LangVersion>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -18,16 +19,7 @@
     <PreBuildEvent />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RGB.NET.Core">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="RGB.NET.Devices.Corsair, Version=0.1.25.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Corsair.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -44,6 +36,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Corsair">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Corsair.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Update="Images\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
similarity index 95%
rename from src/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
index 43b68e493..311487b6c 100644
--- a/src/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
+++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/CorsairDeviceProvider.cs
@@ -27,7 +27,7 @@ namespace Artemis.Plugins.Devices.Corsair
 
         public override void DisablePlugin()
         {
-            // TODO: Remove the device provider from the surface
+            _rgbService.RemoveDeviceProvider(RgbDeviceProvider);
         }
 
         public override void Dispose()
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LEDSTRIP.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LEDSTRIP.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LEDSTRIP.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LEDSTRIP.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LLFAN.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LLFAN.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LLFAN.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/LLFAN.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/PUMP.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/PUMP.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/PUMP.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Customs/PUMP.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/HeadsetStands/ST100RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/HeadsetStands/ST100RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/HeadsetStands/ST100RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/HeadsetStands/ST100RGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Headsets/VOIDRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Headsets/VOIDRGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Headsets/VOIDRGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Headsets/VOIDRGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGBPLATINUM.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGBPLATINUM.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGBPLATINUM.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K95RGBPLATINUM.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_At.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_At.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_Hash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_Hash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_Hash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_Hash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent_Euro.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent_Euro.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent_Euro.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent_Euro.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Circumflex.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Circumflex.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Circumflex.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Circumflex.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Apostrophe_QuotationMark.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Apostrophe_QuotationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Apostrophe_QuotationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Apostrophe_QuotationMark.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Blackslash_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Blackslash_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Blackslash_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Blackslash_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLockText.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLockText.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLockText.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLockText.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Del.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Del.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Del.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Del.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ctrl.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ctrl.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ctrl.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ctrl.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Delete.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Delete.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Delete.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Delete.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/End.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/End.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/End.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/End.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/EnterWText.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/EnterWText.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/EnterWText.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/EnterWText.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Equals_Plus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Equals_Plus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Equals_Plus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Equals_Plus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/GreaterThan_Dot.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/GreaterThan_Dot.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/GreaterThan_Dot.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/GreaterThan_Dot.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hash_Apostrophe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hash_Apostrophe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hash_Apostrophe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hash_Apostrophe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Home.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Home.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Home.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Home.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Insert.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Insert.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Insert.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Insert.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_Comma.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_Comma.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_Comma.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_Comma.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Ins.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Ins.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Ins.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Ins.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_End.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_End.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_End.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_End.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_PgDn.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_PgDn.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_PgDn.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_PgDn.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Home.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Home.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Home.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Home.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_PgUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_PgUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_PgUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_PgUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PageUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseBreak.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseBreak.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseBreak.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseBreak.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PrtScnSysRq.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PrtScnSysRq.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PrtScnSysRq.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PrtScnSysRq.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_Slash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_Slash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ScrollLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ScrollLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ScrollLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ScrollLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Semicolon_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Semicolon_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Semicolon_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Semicolon_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWText.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWText.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWText.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWText.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWTextBig.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWTextBig.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWTextBig.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftWTextBig.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketLeft_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketLeft_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketLeft_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketLeft_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketRight_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketRight_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketRight_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/SquareBracketRight_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/TabWText.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/TabWText.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/TabWText.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/TabWText.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Missing.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Missing.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Missing.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Missing.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_Equals_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_Equals_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_Equals_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/0_Equals_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/1_ExclamationMark.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/1_ExclamationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/1_ExclamationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/1_ExclamationMark.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At_Quote.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At_Quote.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At_Quote.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_At_Quote.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_QuotationMark_Exponent2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_QuotationMark_Exponent2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_QuotationMark_Exponent2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/2_QuotationMark_Exponent2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Hash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Hash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Hash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Hash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Pound_Hash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Pound_Hash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Pound_Hash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_Pound_Hash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_SectionSign_Exponent3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_SectionSign_Exponent3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_SectionSign_Exponent3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/3_SectionSign_Exponent3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar_O.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar_O.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar_O.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/4_Dollar_O.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent_Euro.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent_Euro.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent_Euro.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/5_Percent_Euro.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Circumflex.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Circumflex.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Circumflex.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/6_Circumflex.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Slash_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Slash_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Slash_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/7_Slash_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_BracketLeft_SquareBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_BracketLeft_SquareBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_BracketLeft_SquareBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/8_BracketLeft_SquareBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight_SquareBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight_SquareBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight_SquareBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/9_BracketRight_SquareBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/A.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/A.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/A.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/A.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ARing.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ARing.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ARing.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ARing.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_AccentAcute.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_AccentAcute.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_AccentAcute.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_AccentAcute.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Pipe_AccentGrave.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Pipe_AccentGrave.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Pipe_AccentGrave.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Pipe_AccentGrave.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AccentGrave_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Alt.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Alt.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Alt.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Alt.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AltGr.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AltGr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AltGr.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/AltGr.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Apostrophe_QuotationMark.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Apostrophe_QuotationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Apostrophe_QuotationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Apostrophe_QuotationMark.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ash_O-Umlaut_SlashedO.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ash_O-Umlaut_SlashedO.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ash_O-Umlaut_SlashedO.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ash_O-Umlaut_SlashedO.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/B.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/B.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/B.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/B.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Backspace.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Backspace.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Backspace.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Backspace.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe_Wide.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe_Wide.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe_Wide.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Blackslash_Pipe_Wide.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Brightness.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Brightness.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Brightness.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Brightness.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/C.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/C.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/C.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/C.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CapsLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CapsLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CapsLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CapsLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/CaretUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Circumflex_Degree.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Circumflex_Degree.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Circumflex_Degree.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Circumflex_Degree.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Entf.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Entf.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Semicolon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Semicolon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Semicolon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Comma_Semicolon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ctrl.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ctrl.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ctrl.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ctrl.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/D.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/D.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/D.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/D.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Delete.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Delete.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Delete.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Delete.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Del.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Del.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Del.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Dot_Del.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/DoubleDecimal_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/DoubleDecimal_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/DoubleDecimal_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/DoubleDecimal_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Drucken.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Drucken.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Drucken.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Drucken.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E_Euro.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E_Euro.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E_Euro.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/E_Euro.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/End.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/End.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/End.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/End.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ende.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Ende.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Enter.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Enter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Enter.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Enter.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/EnterNarrow.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/EnterNarrow.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/EnterNarrow.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/EnterNarrow.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Entf.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Entf.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Equals_Plus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Equals_Plus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Equals_Plus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Equals_Plus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Escape.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Escape.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Escape.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Escape.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F10.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F10.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F10.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F10.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F11.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F11.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F11.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F11.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F12.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F12.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F12.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F12.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F4.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F4.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F4.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F6.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F6.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F6.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F7.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F7.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F7.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F8.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F8.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F8.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F9.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F9.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/F9.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G2.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G2.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G2.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G3.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G3.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G3.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G4.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G4.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G4.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G6.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G6.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/G6.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/GreaterThan_Dot.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/GreaterThan_Dot.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/GreaterThan_Dot.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/GreaterThan_Dot.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/H.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/H.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/H.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/H.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hash_Apostrophe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hash_Apostrophe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hash_Apostrophe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hash_Apostrophe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Home.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Home.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Home.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Home.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hyphen_Underscore.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hyphen_Underscore.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hyphen_Underscore.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Hyphen_Underscore.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/I.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/I.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/I.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/I.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Insert.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Insert.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Insert.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Insert.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/J.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/J.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/J.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/J.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/K.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/K.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/K.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/K.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/L.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/L.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/L.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/L.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_Comma.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_Comma.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_Comma.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_Comma.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_GreaterThan_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_GreaterThan_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_GreaterThan_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/LessThan_GreaterThan_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M_Mu.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M_Mu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M_Mu.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/M_Mu.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Menu.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Menu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Menu.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Menu.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Minus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Minus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Minus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Minus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Mute.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Mute.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Mute.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Mute.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/N.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/N.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/N.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/N.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NextTrack.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NextTrack.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NextTrack.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NextTrack.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Ins.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Ins.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Ins.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num0_Ins.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_End.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_End.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_End.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_End.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_Ende.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num1_Ende.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num2_ArrowDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num2_ArrowDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num2_ArrowDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num2_ArrowDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_PgDwn.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_PgDwn.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_PgDwn.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num3_PgDwn.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num4_ArrowLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num4_ArrowLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num4_ArrowLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num4_ArrowLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num5.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num5.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num5.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num6_ArrowRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num6_ArrowRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num6_ArrowRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num6_ArrowRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Home.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Home.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Home.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Home.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num7_Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num8_ArrowUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num8_ArrowUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num8_ArrowUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num8_ArrowUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_PgUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_PgUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_PgUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Num9_PgUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumEnter.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumEnter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumEnter.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumEnter.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumPlus.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumPlus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumPlus.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/NumPlus.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/O.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/O.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/O.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/O.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/OE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/OE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/OE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/OE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/P.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/P.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/P.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/P.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageDown.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageDown.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageUp.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PageUp.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Paragraph_Pipe_Half.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Paragraph_Pipe_Half.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Paragraph_Pipe_Half.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Paragraph_Pipe_Half.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseBreak.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseBreak.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseBreak.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseBreak.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseUntbr.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseUntbr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseUntbr.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PauseUntbr.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PlayPause.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PlayPause.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PlayPause.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PlayPause.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Asterisk_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Asterisk_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Asterisk_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Asterisk_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Backslash_QuestionMark.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Backslash_QuestionMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Backslash_QuestionMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Plus_Backslash_QuestionMark.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PreviousTrack.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PreviousTrack.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PreviousTrack.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PreviousTrack.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PrintScreen.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PrintScreen.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PrintScreen.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/PrintScreen.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q_At.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Q_At.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_SharpS_Backslash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_SharpS_Backslash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_SharpS_Backslash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_SharpS_Backslash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_Slash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/QuestionMark_Slash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/R.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/R.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/R.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/R.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Rollen.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Rollen.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Rollen.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Rollen.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/S.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/S.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/S.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/S.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ScrollLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ScrollLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ScrollLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ScrollLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Semicolon_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Semicolon_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Semicolon_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Semicolon_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Shift.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Shift.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Shift.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Shift.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ShiftBig.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ShiftBig.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ShiftBig.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/ShiftBig.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Slash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Slash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SlashedO_AE_Ash.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SlashedO_AE_Ash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SlashedO_AE_Ash.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SlashedO_AE_Ash.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Space.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Space.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Space.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Space.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketLeft_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketLeft_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketLeft_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketLeft_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketRight_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketRight_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketRight_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/SquareBracketRight_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Stop.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Stop.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Stop.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Stop.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Strg.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Strg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Strg.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Strg.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/T.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/T.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/T.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/T.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Tab.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Tab.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Tab.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Tab.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/U.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/U.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/U.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/U.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/UE.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/UE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/UE.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/UE.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/V.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/V.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/V.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/V.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/W.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/W.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/W.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/W.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/WinLock.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/WinLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/WinLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/WinLock.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Windows.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Windows.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Windows.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Windows.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/X.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/X.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/X.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/X.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Y.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Y.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Y.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Y.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Z.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Z.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Z.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Keyboards/Strafe_Keys/Z.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/DARKCORERGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/DARKCORERGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/DARKCORERGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/DARKCORERGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/GLAIVERGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/GLAIVERGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/GLAIVERGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/GLAIVERGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/HARPOONRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/HARPOONRGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/HARPOONRGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/HARPOONRGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/IRONCLAWRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/IRONCLAWRGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/IRONCLAWRGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/IRONCLAWRGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M55RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M55RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M55RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M55RGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M65RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M65RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M65RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/M65RGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/NIGHTSWORDRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/NIGHTSWORDRGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/NIGHTSWORDRGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/NIGHTSWORDRGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SABRERGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SABRERGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SABRERGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SABRERGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SCIMITARRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SCIMITARRGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SCIMITARRGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mice/SCIMITARRGB.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mousepads/MM800RGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mousepads/MM800RGB.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mousepads/MM800RGB.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Mousepads/MM800RGB.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/empty.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/empty.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/empty.png
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/empty.png
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LEDSTRIP.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LEDSTRIP.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LEDSTRIP.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LEDSTRIP.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LLFAN.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LLFAN.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LLFAN.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/LLFAN.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/PUMP.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/PUMP.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/PUMP.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Customs/PUMP.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/HeadsetStands/ST100RGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/HeadsetStands/ST100RGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/HeadsetStands/ST100RGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/HeadsetStands/ST100RGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSO.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSO.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSO.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSO.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSOSE.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSOSE.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSOSE.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VIRTUOSOSE.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VOIDRGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VOIDRGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VOIDRGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Headsets/VOIDRGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K65RGB/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K65RGB/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K65RGB/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K65RGB/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
similarity index 99%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
index ad264f172..ae96732e9 100644
--- a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
+++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/UK.xml
@@ -2,6 +2,7 @@
 <Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Corsair K95 RGB PLATINUM - Physical UK</Name>
   <Description>Physical UK-Layout of Corsairs K95 RGB PLATINUM (Logical: BE, CH, DE, ES, EU_Int, FR, IT, ND, MEX, PT, TR, UK)</Description>
+  <Author>Darth Affe</Author>
   <Type>Keyboard</Type>
   <Lighting>Key</Lighting>
   <Vendor>Corsair</Vendor>
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUM/US.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/US.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/US.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/US.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGBPLATINUMXT/US.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/DARKCORERGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/DARKCORERGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/DARKCORERGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/DARKCORERGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/GLAIVERGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/HARPOONRGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/HARPOONRGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/HARPOONRGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/HARPOONRGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/IRONCLAWRGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/IRONCLAWRGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/IRONCLAWRGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/IRONCLAWRGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M55RGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M55RGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M55RGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M55RGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M65RGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M65RGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M65RGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/M65RGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/NIGHTSWORDRGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/NIGHTSWORDRGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/NIGHTSWORDRGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/NIGHTSWORDRGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SABRERGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SABRERGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SABRERGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SABRERGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITARPRORGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITARPRORGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITARPRORGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mice/SCIMITARPRORGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mousepads/MM800RGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mousepads/MM800RGB.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mousepads/MM800RGB.xml
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Mousepads/MM800RGB.xml
diff --git a/src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/Properties/AssemblyInfo.cs
diff --git a/src/Artemis.Plugins.Devices.Corsair/app.config b/src/Plugins/Artemis.Plugins.Devices.Corsair/app.config
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/app.config
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/app.config
diff --git a/src/Artemis.Plugins.Devices.Corsair/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Corsair/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/plugin.json
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/plugin.json
diff --git a/src/Artemis.Plugins.Devices.Corsair/x64/CUESDK.x64_2017.dll b/src/Plugins/Artemis.Plugins.Devices.Corsair/x64/CUESDK.x64_2017.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/x64/CUESDK.x64_2017.dll
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/x64/CUESDK.x64_2017.dll
diff --git a/src/Artemis.Plugins.Devices.Corsair/x86/CUESDK_2017.dll b/src/Plugins/Artemis.Plugins.Devices.Corsair/x86/CUESDK_2017.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Corsair/x86/CUESDK_2017.dll
rename to src/Plugins/Artemis.Plugins.Devices.Corsair/x86/CUESDK_2017.dll
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj b/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj
new file mode 100644
index 000000000..1f0b9430e
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Views\DMXConfigurationView.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.DMX">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.DMX.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs
new file mode 100644
index 000000000..61f3047bd
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/DMXDeviceProvider.cs
@@ -0,0 +1,44 @@
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Plugins.Devices.DMX.ViewModels;
+
+namespace Artemis.Plugins.Devices.DMX
+{
+    // ReSharper disable once UnusedMember.Global
+    public class DMXDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public DMXDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.DMX.DMXDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+            HasConfigurationViewModel = true;
+        }
+
+        public override void EnablePlugin()
+        {
+            // TODO: Load from configuration
+            // RGB.NET.Devices.DMX.DMXDeviceProvider.Instance.AddDeviceDefinition();
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // DMXDeviceProvider.Instance.ResetDevices();
+            // DMXDeviceProvider.Instance.Dispose();
+        }
+
+        public override PluginConfigurationViewModel GetConfigurationViewModel()
+        {
+            return new DMXConfigurationViewModel(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.DMX/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs
new file mode 100644
index 000000000..e11e7ec62
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/ViewModels/DMXConfigurationViewModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
+
+namespace Artemis.Plugins.Devices.DMX.ViewModels
+{
+    public class DMXConfigurationViewModel : PluginConfigurationViewModel
+    {
+        public DMXConfigurationViewModel(Plugin plugin) : base(plugin)
+        {
+            var dmxInstance = RGB.NET.Devices.DMX.DMXDeviceProvider.Instance;
+            
+        }
+    }
+}
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/Views/DMXConfigurationView.xaml b/src/Plugins/Artemis.Plugins.Devices.DMX/Views/DMXConfigurationView.xaml
new file mode 100644
index 000000000..f632c92da
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/Views/DMXConfigurationView.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="Artemis.Plugins.Devices.DMX.Views.DMXConfigurationView"
+             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:local="clr-namespace:Artemis.Plugins.Devices.DMX.Views"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="16">
+        <materialDesign:PackIcon Kind="Crane" Width="250" Height="250" HorizontalAlignment="Center" />
+        <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 25">
+            DMX settings are not yet implemented
+        </TextBlock>
+        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 25">
+            DMX LED controllers require extra setup that needs to be configured in this window. <LineBreak />
+            That however isn't built yet :o).
+        </TextBlock>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/app.config b/src/Plugins/Artemis.Plugins.Devices.DMX/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.DMX/plugin.json b/src/Plugins/Artemis.Plugins.Devices.DMX/plugin.json
new file mode 100644
index 000000000..d4270e256
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.DMX/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "6f073d4d-d97d-4040-9750-841fdbe06915",
+  "Name": "DMX Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.DMX.dll"
+}
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj b/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj
similarity index 86%
rename from src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj
index 11e231da6..c9fc0cc53 100644
--- a/src/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj
+++ b/src/Plugins/Artemis.Plugins.Devices.Logitech/Artemis.Plugins.Devices.Logitech.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>Artemis.Plugins.Devices.Logitech</AssemblyTitle>
@@ -7,6 +7,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <LangVersion>7.3</LangVersion>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -14,19 +15,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="RGB.NET.Core">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="RGB.NET.Devices.Logitech">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Logitech.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="x64\LogitechLedEnginesWrapper.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -40,6 +28,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Logitech">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Logitech.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Update="Images\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/G910.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/G910.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/G910.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/G910.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/0_Equals_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/0_Equals_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/0_Equals_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/0_Equals_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/1_ExclamationMark.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/1_ExclamationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/1_ExclamationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/1_ExclamationMark.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/2_QuotationMark_Exponent2.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/2_QuotationMark_Exponent2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/2_QuotationMark_Exponent2.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/2_QuotationMark_Exponent2.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/3_SectionSign_Exponent3.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/3_SectionSign_Exponent3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/3_SectionSign_Exponent3.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/3_SectionSign_Exponent3.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/4_Dollar.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/4_Dollar.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/4_Dollar.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/4_Dollar.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/5_Percent.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/5_Percent.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/5_Percent.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/5_Percent.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/6_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/6_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/6_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/6_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/7_Slash_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/7_Slash_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/7_Slash_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/7_Slash_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/8_BracketLeft_SquareBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/8_BracketLeft_SquareBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/8_BracketLeft_SquareBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/8_BracketLeft_SquareBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/9_BracketRight_SquareBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/9_BracketRight_SquareBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/9_BracketRight_SquareBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/9_BracketRight_SquareBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/A.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/A.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/A.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/A.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AE.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AE.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AE.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AccentGrave_AccentAcute.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AccentGrave_AccentAcute.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AccentGrave_AccentAcute.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AccentGrave_AccentAcute.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Alt.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Alt.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Alt.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Alt.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AltGr.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AltGr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AltGr.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/AltGr.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/B.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/B.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/B.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/B.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Backspace.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Backspace.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Backspace.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Backspace.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/C.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/C.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/C.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/C.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CapsLockA.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CapsLockA.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CapsLockA.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CapsLockA.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretDown.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretDown.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretLeft.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretLeft.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretRight.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretRight.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretUp.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/CaretUp.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Circumflex_Degree.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Circumflex_Degree.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Circumflex_Degree.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Circumflex_Degree.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Entf.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Entf.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Semicolon.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Semicolon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Semicolon.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Comma_Semicolon.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/D.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/D.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/D.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/D.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Dot_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Dot_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Dot_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Dot_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Drucken.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Drucken.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Drucken.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Drucken.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/E_Euro.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/E_Euro.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/E_Euro.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/E_Euro.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Ende.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Ende.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Enter.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Enter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Enter.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Enter.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Entf.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Entf.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Entf.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Entf.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Escape.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Escape.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Escape.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Escape.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F1.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F1.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F1.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F10.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F10.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F10.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F10.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F11.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F11.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F11.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F11.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F12.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F12.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F12.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F12.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F2.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F2.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F2.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F3.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F3.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F3.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F4.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F4.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F4.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F5.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F5.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F5.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F6.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F6.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F6.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F7.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F7.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F7.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F8.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F8.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F8.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F9.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F9.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/F9.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G1.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G1.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G1.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G2.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G2.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G2.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G3.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G3.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G3.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G4.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G4.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G4.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G5.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G5.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G5.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G6.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G6.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G6.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G7.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G7.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G7.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G8.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G8.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G8.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G9.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G9.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/G9.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/H.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/H.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/H.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/H.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hash_Apostrophe.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hash_Apostrophe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hash_Apostrophe.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hash_Apostrophe.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hyphen_Underscore.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hyphen_Underscore.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hyphen_Underscore.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Hyphen_Underscore.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/I.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/I.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/I.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/I.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/J.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/J.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/J.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/J.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/K.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/K.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/K.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/K.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/L.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/L.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/L.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/L.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/LessThan_GreaterThan_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/LessThan_GreaterThan_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/LessThan_GreaterThan_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/LessThan_GreaterThan_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/M_Mu.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/M_Mu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/M_Mu.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/M_Mu.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Menu.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Menu.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Menu.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Menu.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Minus.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Minus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Minus.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Minus.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/N.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/N.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/N.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/N.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num0_Einfg.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num0_Einfg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num0_Einfg.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num0_Einfg.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num1_Ende.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num1_Ende.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num1_Ende.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num1_Ende.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num2_ArrowDown.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num2_ArrowDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num2_ArrowDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num2_ArrowDown.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num3_BildDown.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num3_BildDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num3_BildDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num3_BildDown.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num4_ArrowLeft.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num4_ArrowLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num4_ArrowLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num4_ArrowLeft.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num5.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num5.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num5.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num6_ArrowRight.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num6_ArrowRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num6_ArrowRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num6_ArrowRight.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num7_Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num7_Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num7_Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num7_Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num8_ArrowUp.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num8_ArrowUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num8_ArrowUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num8_ArrowUp.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num9_BildUp.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num9_BildUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num9_BildUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Num9_BildUp.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumEnter.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumEnter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumEnter.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumEnter.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumPlus.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumPlus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumPlus.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/NumPlus.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/O.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/O.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/O.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/O.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/OE.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/OE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/OE.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/OE.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/P.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/P.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/P.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/P.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/PauseUntbr.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/PauseUntbr.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/PauseUntbr.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/PauseUntbr.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Plus_Asterisk_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Plus_Asterisk_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Plus_Asterisk_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Plus_Asterisk_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Pos1.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Pos1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Pos1.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Pos1.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Q_At.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Q_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Q_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Q_At.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/QuestionMark_SharpS_Backslash.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/QuestionMark_SharpS_Backslash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/QuestionMark_SharpS_Backslash.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/QuestionMark_SharpS_Backslash.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/R.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/R.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/R.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/R.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Rollen.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Rollen.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Rollen.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Rollen.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/S.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/S.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/S.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/S.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Shift.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Shift.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Shift.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Shift.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/ShiftBig.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/ShiftBig.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/ShiftBig.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/ShiftBig.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Slash.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Slash.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Space.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Space.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Space.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Space.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Strg.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Strg.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Strg.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Strg.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/T.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/T.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/T.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/T.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Tab.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Tab.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Tab.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Tab.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/U.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/U.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/U.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/U.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/UE.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/UE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/UE.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/UE.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/V.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/V.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/V.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/V.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/W.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/W.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/W.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/W.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Windows.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Windows.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Windows.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Windows.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/X.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/X.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/X.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/X.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Y.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Y.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Y.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Y.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Z.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Z.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Z.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Keyboards/Raptor_Keys/Z.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Mice/G403.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Mice/G403.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Images/Logitech/Mice/G403.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/Mice/G403.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/empty.png b/src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/empty.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/empty.png
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Images/Logitech/empty.png
diff --git a/src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G810/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G810/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G810/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G810/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/Pro/UK.xml b/src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/Pro/UK.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/Pro/UK.xml
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Keyboards/Pro/UK.xml
diff --git a/src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G403.xml b/src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G403.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G403.xml
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Layouts/Logitech/Mice/G403.xml
diff --git a/src/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/LogitechDeviceProvider.cs
diff --git a/src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/Properties/AssemblyInfo.cs
diff --git a/src/Plugins/Artemis.Plugins.Devices.Logitech/app.config b/src/Plugins/Artemis.Plugins.Devices.Logitech/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Logitech/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Logitech/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Logitech/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/plugin.json
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/plugin.json
diff --git a/src/Artemis.Plugins.Devices.Logitech/x64/LogitechLedEnginesWrapper.dll b/src/Plugins/Artemis.Plugins.Devices.Logitech/x64/LogitechLedEnginesWrapper.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/x64/LogitechLedEnginesWrapper.dll
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/x64/LogitechLedEnginesWrapper.dll
diff --git a/src/Artemis.Plugins.Devices.Logitech/x86/LogitechLedEnginesWrapper.dll b/src/Plugins/Artemis.Plugins.Devices.Logitech/x86/LogitechLedEnginesWrapper.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Logitech/x86/LogitechLedEnginesWrapper.dll
rename to src/Plugins/Artemis.Plugins.Devices.Logitech/x86/LogitechLedEnginesWrapper.dll
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj b/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj
new file mode 100644
index 000000000..ebadcfd58
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Msi/Artemis.Plugins.Devices.Msi.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Msi">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Msi.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Layouts\Msi\" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/Mainboards/PRIMEX370-PRO.png b/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/Mainboards/PRIMEX370-PRO.png
new file mode 100644
index 000000000..59a8d13ec
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/Mainboards/PRIMEX370-PRO.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/empty.png b/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/empty.png
new file mode 100644
index 000000000..af367b99a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Msi/Images/Msi/empty.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs
new file mode 100644
index 000000000..f04102a0a
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Msi/MsiDeviceProvider.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.Msi;
+
+namespace Artemis.Plugins.Devices.Msi
+{
+    // ReSharper disable once UnusedMember.Global
+    public class MsiDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public MsiDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.Msi.MsiDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(MsiRGBDevice<>), sender, args);
+            RGB.NET.Devices.Msi.MsiDeviceProvider.PossibleX64NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x64", "MysticLight_SDK.dll"));
+            RGB.NET.Devices.Msi.MsiDeviceProvider.PossibleX86NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x86", "MysticLight_SDK.dll"));
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // MsiDeviceProvider.Instance.ResetDevices();
+            // MsiDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Msi/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Msi/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/app.config b/src/Plugins/Artemis.Plugins.Devices.Msi/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Msi/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Msi/plugin.json
new file mode 100644
index 000000000..a3d2ea984
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Msi/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "9177c320-1206-48a3-af52-b1749c758786",
+  "Name": "Msi Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.Msi.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/x64/MysticLight_SDK.dll b/src/Plugins/Artemis.Plugins.Devices.Msi/x64/MysticLight_SDK.dll
new file mode 100644
index 000000000..eff01734b
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Msi/x64/MysticLight_SDK.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Msi/x86/MysticLight_SDK.dll b/src/Plugins/Artemis.Plugins.Devices.Msi/x86/MysticLight_SDK.dll
new file mode 100644
index 000000000..04684789c
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Msi/x86/MysticLight_SDK.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj b/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj
new file mode 100644
index 000000000..90e20d376
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/Artemis.Plugins.Devices.Novation.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="x64\**" />
+    <Compile Remove="x86\**" />
+    <EmbeddedResource Remove="x64\**" />
+    <EmbeddedResource Remove="x86\**" />
+    <None Remove="x64\**" />
+    <None Remove="x86\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Novation">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Novation.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Grid.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Grid.png
new file mode 100644
index 000000000..7a492cb87
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Grid.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter1.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter1.png
new file mode 100644
index 000000000..351d43920
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter1.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter2.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter2.png
new file mode 100644
index 000000000..1b45cf714
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter2.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter3.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter3.png
new file mode 100644
index 000000000..592d3e543
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter3.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter4.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter4.png
new file mode 100644
index 000000000..988a19b39
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/GridCenter4.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Round.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Round.png
new file mode 100644
index 000000000..fc3437fb5
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/Buttons/Round.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/LaunchpadS.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/LaunchpadS.png
new file mode 100644
index 000000000..51970ea05
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/Launchpads/LaunchpadS.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/empty.png b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/empty.png
new file mode 100644
index 000000000..af367b99a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Novation/Images/Novation/empty.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Layouts/Novation/Launchpads/LaunchpadS.xml b/src/Plugins/Artemis.Plugins.Devices.Novation/Layouts/Novation/Launchpads/LaunchpadS.xml
new file mode 100644
index 000000000..53e1975c7
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/Layouts/Novation/Launchpads/LaunchpadS.xml
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Launchpad S</Name>
+  <Description>Launchpad S (8x8-Pad Grid)</Description>
+  <Author>Darth Affe</Author>
+  <Type>LedMatrix</Type>
+  <Lighting>Key</Lighting>
+  <Vendor>Novation</Vendor>
+  <Model>Launchpad S</Model>
+  <Width>240</Width>
+  <Height>240</Height>
+  <LedUnitWidth>20</LedUnitWidth>
+  <LedUnitHeight>20</LedUnitHeight>
+  <ImageBasePath>Images\Novation\Launchpads</ImageBasePath>
+  <DeviceImage>LaunchpadS.png</DeviceImage>
+  <Leds>
+    <!-- Custom-buttons -->
+    <Led Id="Custom1">
+      <Shape>Circle</Shape>
+      <X>16</X>
+      <Y>18</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom2">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom3">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom4">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom5">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom6">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom7">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom8">
+      <Shape>Circle</Shape>
+      <X>+8</X>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+
+    <!-- Grid -->
+    <Led Id="LedMatrix1">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix2">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix3">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix4">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix5">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix6">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix7">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix8">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix9">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix10">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix11">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix12">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix13">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix14">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix15">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix16">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix17">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix18">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix19">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix20">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix21">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix22">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix23">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix24">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix25">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix26">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix27">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix28">
+      <X>+4</X>
+      <Shape>M0,0 L0,1 L0.75,1 L1,0.75 L1,0 Z</Shape>
+    </Led>
+    <Led Id="LedMatrix29">
+      <X>+4</X>
+      <Shape>M0,0 L0,0.75 L0.25,1 L1,1 L1,0 Z</Shape>
+    </Led>
+    <Led Id="LedMatrix30">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix31">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix32">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix33">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix34">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix35">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix36">
+      <X>+4</X>
+      <Shape>M0,0 L0,1 L1,1 L1,0.25 L0.75,0 Z</Shape>
+    </Led>
+    <Led Id="LedMatrix37">
+      <X>+4</X>
+      <Shape>M0,0.25 L0,1 L1,1 L1,0 L0.25,0 Z</Shape>
+    </Led>
+    <Led Id="LedMatrix38">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix39">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix40">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix41">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix42">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix43">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix44">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix45">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix46">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix47">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix48">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix49">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix50">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix51">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix52">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix53">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix54">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix55">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix56">
+      <X>+4</X>
+    </Led>
+
+    <Led Id="LedMatrix57">
+      <X>14</X>
+      <Y>+4</Y>
+    </Led>
+    <Led Id="LedMatrix58">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix59">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix60">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix61">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix62">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix63">
+      <X>+4</X>
+    </Led>
+    <Led Id="LedMatrix64">
+      <X>+4</X>
+    </Led>
+
+    <!-- Scene-buttons -->
+    <Led Id="Custom9">
+      <Shape>Circle</Shape>
+      <X>+4</X>
+      <Y>40</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom10">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom11">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom12">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom13">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom14">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom15">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+    <Led Id="Custom16">
+      <Shape>Circle</Shape>
+      <X>~</X>
+      <Y>+8</Y>
+      <Width>16mm</Width>
+      <Height>16mm</Height>
+    </Led>
+  </Leds>
+
+  <LedImageLayouts>
+    <LedImageLayout Layout="Default">
+      <LedImages>
+        <LedImage Id="Custom1" Image="Buttons\Round.png" />
+        <LedImage Id="Custom2" Image="Buttons\Round.png" />
+        <LedImage Id="Custom3" Image="Buttons\Round.png" />
+        <LedImage Id="Custom4" Image="Buttons\Round.png" />
+        <LedImage Id="Custom5" Image="Buttons\Round.png" />
+        <LedImage Id="Custom6" Image="Buttons\Round.png" />
+        <LedImage Id="Custom7" Image="Buttons\Round.png" />
+        <LedImage Id="Custom8" Image="Buttons\Round.png" />
+
+        <LedImage Id="Custom9" Image="Buttons\Round.png" />
+        <LedImage Id="Custom10" Image="Buttons\Round.png" />
+        <LedImage Id="Custom11" Image="Buttons\Round.png" />
+        <LedImage Id="Custom12" Image="Buttons\Round.png" />
+        <LedImage Id="Custom13" Image="Buttons\Round.png" />
+        <LedImage Id="Custom14" Image="Buttons\Round.png" />
+        <LedImage Id="Custom15" Image="Buttons\Round.png" />
+        <LedImage Id="Custom16" Image="Buttons\Round.png" />
+
+        <LedImage Id="LedMatrix1" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix2" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix3" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix4" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix5" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix6" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix7" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix8" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix9" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix10" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix11" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix12" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix13" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix14" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix15" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix16" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix17" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix18" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix19" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix20" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix21" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix22" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix23" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix24" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix25" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix26" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix27" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix28" Image="Buttons\GridCenter1.png" />
+        <LedImage Id="LedMatrix29" Image="Buttons\GridCenter2.png" />
+        <LedImage Id="LedMatrix30" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix31" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix32" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix33" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix34" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix35" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix36" Image="Buttons\GridCenter3.png" />
+        <LedImage Id="LedMatrix37" Image="Buttons\GridCenter4.png" />
+        <LedImage Id="LedMatrix38" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix39" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix40" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix41" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix42" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix43" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix44" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix45" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix46" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix47" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix48" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix49" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix50" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix51" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix52" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix53" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix54" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix55" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix56" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix57" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix58" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix59" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix60" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix61" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix62" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix63" Image="Buttons\Grid.png" />
+        <LedImage Id="LedMatrix64" Image="Buttons\Grid.png" />
+      </LedImages>
+    </LedImageLayout>
+  </LedImageLayouts>
+</Device>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs
new file mode 100644
index 000000000..c1b0879c5
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/NovationDeviceProvider.cs
@@ -0,0 +1,37 @@
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.Novation;
+
+namespace Artemis.Plugins.Devices.Novation
+{
+    // ReSharper disable once UnusedMember.Global
+    public class NovationDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public NovationDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.Novation.NovationDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(NovationRGBDevice<>), sender, args);
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // NovationDeviceProvider.Instance.ResetDevices();
+            // NovationDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Novation/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/app.config b/src/Plugins/Artemis.Plugins.Devices.Novation/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Novation/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Novation/plugin.json
new file mode 100644
index 000000000..3b52164dc
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Novation/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "a487332f-c4b3-43e7-b80f-f33adc6fff87",
+  "Name": "Novation Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.Novation.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj b/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj
new file mode 100644
index 000000000..11ea38631
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Razer/Artemis.Plugins.Devices.Razer.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Razer">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Razer.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Layouts\Razer\" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/Mainboards/PRIMEX370-PRO.png b/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/Mainboards/PRIMEX370-PRO.png
new file mode 100644
index 000000000..59a8d13ec
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/Mainboards/PRIMEX370-PRO.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/empty.png b/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/empty.png
new file mode 100644
index 000000000..af367b99a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Razer/Images/Razer/empty.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Razer/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Razer/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs
new file mode 100644
index 000000000..bdb8fe98d
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Razer/RazerDeviceProvider.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.Razer;
+
+namespace Artemis.Plugins.Devices.Razer
+{
+    // ReSharper disable once UnusedMember.Global
+    public class RazerDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public RazerDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.Razer.RazerDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(RazerRGBDevice<>), sender, args);
+            RGB.NET.Devices.Razer.RazerDeviceProvider.PossibleX64NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x64", "RzChromaSDK.dll"));
+            RGB.NET.Devices.Razer.RazerDeviceProvider.PossibleX86NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x86", "RzChromaSDK.dll"));
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // RazerDeviceProvider.Instance.ResetDevices();
+            // RazerDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/app.config b/src/Plugins/Artemis.Plugins.Devices.Razer/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Razer/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Razer/plugin.json
new file mode 100644
index 000000000..5fc2496a0
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Razer/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "58a3d80e-d5cb-4a40-9465-c0a5d54825d6",
+  "Name": "Razer Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.Razer.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/x64/RzChromaSDK.dll b/src/Plugins/Artemis.Plugins.Devices.Razer/x64/RzChromaSDK.dll
new file mode 100644
index 000000000..d507ef6a4
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Razer/x64/RzChromaSDK.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Razer/x86/RzChromaSDK.dll b/src/Plugins/Artemis.Plugins.Devices.Razer/x86/RzChromaSDK.dll
new file mode 100644
index 000000000..fcd313532
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Razer/x86/RzChromaSDK.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj b/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj
new file mode 100644
index 000000000..90efa29c9
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/Artemis.Plugins.Devices.Roccat.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Roccat">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Roccat.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/Mainboards/PRIMEX370-PRO.png b/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/Mainboards/PRIMEX370-PRO.png
new file mode 100644
index 000000000..59a8d13ec
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/Mainboards/PRIMEX370-PRO.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/empty.png b/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/empty.png
new file mode 100644
index 000000000..af367b99a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Roccat/Images/Roccat/empty.png differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Layouts/Roccat/Mainboards/PRIMEX370-PRO.xml b/src/Plugins/Artemis.Plugins.Devices.Roccat/Layouts/Roccat/Mainboards/PRIMEX370-PRO.xml
new file mode 100644
index 000000000..f174ac257
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/Layouts/Roccat/Mainboards/PRIMEX370-PRO.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Roccat Prime X370-PRO</Name>
+  <Description>Roccat Prime X370-PRO Mainboard</Description>
+  <Author>Darth Affe</Author>
+  <Type>Mainboard</Type>
+  <Lighting>Key</Lighting>
+  <Vendor>Roccat</Vendor>
+  <Model>Prime X370-PRO</Model>
+  <Width>252</Width>
+  <Height>305</Height>
+  <ImageBasePath>Images\Roccat\Mainboards</ImageBasePath>
+  <DeviceImage>PRIMEX370-PRO.png</DeviceImage>
+  <Leds>
+    <Led Id="Mainboard1">
+      <X>0</X>
+      <Y>131</Y>
+      <Width>35mm</Width>
+      <Height>57mm</Height>
+      <Shape>M 0,0 L 0,1 L 0.325,1 L 0.325,0 Z   M 0.862,0 L 0.822,0.06 L 0.904,0.11 L 0.91,0.505 L 0.86,0.532 L 0.74,0.532 L 0.6575,0.485 L 0.54,0.485 L 0.425,0.55 L 0.425,0.64 L0.44,0.66 L0.44,0.755 L 0.4,0.78 L 0.4,1  L 0.5,1 L 0.5,0.805 L 0.53,0.785 L 0.53,0.6325 L 0.515,0.6225 L 0.515,0.575 L 0.575,0.543 L 0.6225,0.543 L 0.705,0.59 L 0.9,0.59 L 1,0.525 L 1,0.08 Z</Shape>
+    </Led>
+    <Led Id="Mainboard2">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>17mm</Width>
+      <Height>40mm</Height>
+      <Shape>M 0.83,0 L 0.83,1 L1,1 L 1,0 Z   M 0,0 L 0,1 L 0.6691,1 L 0.6691,0 Z</Shape>
+    </Led>
+    <Led Id="Mainboard3">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>44mm</Width>
+      <Height>41mm</Height>
+      <Shape>
+        M 0,0 L 0,1 L 0.26,1 L 0.26,0 Z   M 0.32,0 L 0.32,0.29 L 0.365,0.325 L 0.395,0.325 L 0.395,0.36 L 0.455,0.41  L 0.49,0.345 L 0.4675,0.32 L 0.455,0.2475 L 0.4675,0.26 L 0.395,0.2475 L 0.395,0 Z
+        M 0.935,0.715 L 0.935,0.84 L 0.865,0.915 L 0.865,1  L 0.9375,1 L 0.9375,0.95 L 1,0.88 L 1,0.715 Z
+      </Shape>
+    </Led>
+    <Led Id="Mainboard4">
+      <X>0</X>
+      <Y>+</Y>
+      <Width>68mm</Width>
+      <Height>35mm</Height>
+      <Shape>M 0,0 L 0,1 L 0.94,1 L 0.94,0.95 L 0.206,0.95 Q 0.168,0.95 0.165,0.875 L 0.165,0 Z   M 0.55,0.019 L 0.55,0.132 L 0.578,0.19 L 0.578,0.2078 L 0.612,0.271 L 0.612,0.6625 L 0.635,0.7125 L0.735,0.7125 L0.755,0.75 L 0.915,0.75 L 0.92,0.76 L 0.942,0.76 L 0.94,1  L 0.99,1 L 0.99,0.72 L 0.965,0.67 L 0.935,0.67 L 0.93,0.66 L 0.772,0.66 L 0.752,0.62 L 0.66,0.62 L 0.66,0.237 L 0.622,0.16 L 0.622,0.145 L 0.5975,0.095 L 0.5975,0.019 Z</Shape>
+    </Led>
+    <Led Id="Mainboard5">
+      <X>80</X>
+      <Y>132</Y>
+      <Width>5mm</Width>
+      <Height>13mm</Height>
+    </Led>
+  </Leds>
+</Device>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Roccat/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs
new file mode 100644
index 000000000..27775661d
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/RoccatDeviceProvider.cs
@@ -0,0 +1,41 @@
+using System.IO;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.Roccat;
+
+namespace Artemis.Plugins.Devices.Roccat
+{
+    // ReSharper disable once UnusedMember.Global
+    public class RoccatDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public RoccatDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.Roccat.RoccatDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            // TODO: Find out why this is missing, Roccat seems unimplemented
+            // PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(RoccatRGBDevice<>), sender, args);
+            RGB.NET.Devices.Roccat.RoccatDeviceProvider.PossibleX64NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x64", "RoccatTalkSDKWrapper.dll"));
+            RGB.NET.Devices.Roccat.RoccatDeviceProvider.PossibleX86NativePaths.Add(Path.Combine(PluginInfo.Directory.FullName, "x86", "RoccatTalkSDKWrapper.dll"));
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // RoccatDeviceProvider.Instance.ResetDevices();
+            // RoccatDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/app.config b/src/Plugins/Artemis.Plugins.Devices.Roccat/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Roccat/plugin.json
new file mode 100644
index 000000000..b10a350b7
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Roccat/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "10049953-94c1-4102-988b-9e4f0b64c232",
+  "Name": "Roccat Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.Roccat.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/x64/RoccatTalkSDKWrapper.dll b/src/Plugins/Artemis.Plugins.Devices.Roccat/x64/RoccatTalkSDKWrapper.dll
new file mode 100644
index 000000000..d320cb56a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Roccat/x64/RoccatTalkSDKWrapper.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.Roccat/x86/RoccatTalkSDKWrapper.dll b/src/Plugins/Artemis.Plugins.Devices.Roccat/x86/RoccatTalkSDKWrapper.dll
new file mode 100644
index 000000000..60dd74436
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Roccat/x86/RoccatTalkSDKWrapper.dll differ
diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj
new file mode 100644
index 000000000..30a16321d
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Artemis.Plugins.Devices.SteelSeries.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.SteelSeries">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.SteelSeries.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
new file mode 100644
index 000000000..7f6cec433
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
@@ -0,0 +1,39 @@
+using System.IO;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using RGB.NET.Core;
+using RGB.NET.Devices.SteelSeries;
+
+namespace Artemis.Plugins.Devices.SteelSeries
+{
+    // ReSharper disable once UnusedMember.Global
+    public class SteelSeriesDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public SteelSeriesDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.SteelSeries.SteelSeriesDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+        }
+
+        public override void EnablePlugin()
+        {
+            // TODO Check to see if this works, it's usually a generic type after all
+            PathHelper.ResolvingAbsolutePath += (sender, args) => ResolveAbsolutePath(typeof(SteelSeriesRGBDevice), sender, args);
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // SteelSeriesDeviceProvider.Instance.ResetDevices();
+            // SteelSeriesDeviceProvider.Instance.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/app.config b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.SteelSeries/plugin.json b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/plugin.json
new file mode 100644
index 000000000..688b38aa4
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.SteelSeries/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "27945704-6edd-48b4-bc0e-319cce9693fc",
+  "Name": "SteelSeries Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.SteelSeries.dll"
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj b/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj
new file mode 100644
index 000000000..53c9987fd
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
+    <Product>Artemis.Plugins.Devices.Wooting</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.3</LangVersion>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Views\WS281XConfigurationView.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.WS281X">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.WS281X.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Images\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Layouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+    <Exec Command="echo Copying resources to plugin output directory&#xD;&#xA;XCOPY &quot;$(ProjectDir)Images&quot; &quot;$(TargetDir)Images&quot; /s /q /i /y&#xD;&#xA;XCOPY &quot;$(ProjectDir)Layouts&quot; &quot;$(TargetDir)Layouts&quot; /s /q /i /y&#xD;&#xA;echo Copying plugin to Artemis.UI output directory&#xD;&#xA;XCOPY &quot;$(TargetDir.TrimEnd('\'))&quot; &quot;$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)&quot; /s /q /i /y" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.WS281X/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs b/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs
new file mode 100644
index 000000000..ba8187d0c
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/ViewModels/WS281XConfigurationViewModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
+
+namespace Artemis.Plugins.Devices.WS281X.ViewModels
+{
+    public class WS281XConfigurationViewModel : PluginConfigurationViewModel
+    {
+        public WS281XConfigurationViewModel(Plugin plugin) : base(plugin)
+        {
+            var WS281XInstance = RGB.NET.Devices.WS281X.WS281XDeviceProvider.Instance;
+            
+        }
+    }
+}
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/Views/WS281XConfigurationView.xaml b/src/Plugins/Artemis.Plugins.Devices.WS281X/Views/WS281XConfigurationView.xaml
new file mode 100644
index 000000000..ec7267688
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/Views/WS281XConfigurationView.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="Artemis.Plugins.Devices.WS281X.Views.WS281XConfigurationView"
+             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:local="clr-namespace:Artemis.Plugins.Devices.WS281X.Views"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="16">
+        <materialDesign:PackIcon Kind="Crane" Width="250" Height="250" HorizontalAlignment="Center" />
+        <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 25">
+            WS281X settings are not yet implemented
+        </TextBlock>
+        <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 25">
+            WS281X LED controllers require extra setup that needs to be configured in this window. <LineBreak />
+            That however isn't built yet :o).
+        </TextBlock>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs
new file mode 100644
index 000000000..8a866ff60
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/WS281XDeviceProvider.cs
@@ -0,0 +1,44 @@
+using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services.Interfaces;
+using Artemis.Plugins.Devices.WS281X.ViewModels;
+
+namespace Artemis.Plugins.Devices.WS281X
+{
+    // ReSharper disable once UnusedMember.Global
+    public class WS281XDeviceProvider : DeviceProvider
+    {
+        private readonly IRgbService _rgbService;
+
+        public WS281XDeviceProvider(PluginInfo pluginInfo, IRgbService rgbService) : base(pluginInfo, RGB.NET.Devices.WS281X.WS281XDeviceProvider.Instance)
+        {
+            _rgbService = rgbService;
+            HasConfigurationViewModel = true;
+        }
+
+        public override void EnablePlugin()
+        {
+            // TODO: Load from configuration
+            //RGB.NET.Devices.WS281X.WS281XDeviceProvider.Instance.AddDeviceDefinition();
+            _rgbService.AddDeviceProvider(RgbDeviceProvider);
+        }
+
+        public override void DisablePlugin()
+        {
+            // TODO: Remove the device provider from the surface
+        }
+
+        public override void Dispose()
+        {
+            // TODO: This will probably not go well without first removing the device provider
+            // WS281XDeviceProvider.Instance.ResetDevices();
+            // WS281XDeviceProvider.Instance.Dispose();
+        }
+
+        public override PluginConfigurationViewModel GetConfigurationViewModel()
+        {
+            return new WS281XConfigurationViewModel(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/app.config b/src/Plugins/Artemis.Plugins.Devices.WS281X/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Devices.WS281X/plugin.json b/src/Plugins/Artemis.Plugins.Devices.WS281X/plugin.json
new file mode 100644
index 000000000..d2cd12745
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.WS281X/plugin.json
@@ -0,0 +1,6 @@
+{
+  "Guid": "ec86de32-1010-4bf7-97d7-1dcc46659ab6",
+  "Name": "WS281X Devices",
+  "Version": "1.0.0.0",
+  "Main": "Artemis.Plugins.Devices.WS281X.dll"
+}
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj b/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj
similarity index 87%
rename from src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj
index 4d869f863..2808b5c28 100644
--- a/src/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj
+++ b/src/Plugins/Artemis.Plugins.Devices.Wooting/Artemis.Plugins.Devices.Wooting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>Artemis.Plugins.Devices.Wooting</AssemblyTitle>
@@ -7,6 +7,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <LangVersion>7.3</LangVersion>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -14,21 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="RGB.NET.Core">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="RGB.NET.Devices.Wooting">
-      <HintPath>..\..\..\RGB.NET\bin\net45\RGB.NET.Devices.Wooting.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
@@ -40,6 +33,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="RGB.NET.Core">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RGB.NET.Devices.Wooting">
+      <HintPath>..\..\..\..\RGB.NET\bin\netstandard2.0\RGB.NET.Devices.Wooting.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Update="Images\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Missing.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Missing.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Missing.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Missing.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/0_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/0_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/0_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/0_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/1_ExclamationMark.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/1_ExclamationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/1_ExclamationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/1_ExclamationMark.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/2_At.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/2_At.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/2_At.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/2_At.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/3_Hash.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/3_Hash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/3_Hash.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/3_Hash.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/4_Dollar.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/4_Dollar.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/4_Dollar.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/4_Dollar.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/5_Percent.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/5_Percent.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/5_Percent.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/5_Percent.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/6_Circumflex.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/6_Circumflex.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/6_Circumflex.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/6_Circumflex.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/7_Ampersand.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/7_Ampersand.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/7_Ampersand.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/7_Ampersand.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/8_Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/8_Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/8_Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/8_Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/9_BracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/9_BracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/9_BracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/9_BracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A1.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A1.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A1.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A2.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A2.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A2.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A3.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A3.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/A3.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/AccentGrave_Tilde.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/AccentGrave_Tilde.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/AccentGrave_Tilde.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/AccentGrave_Tilde.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Alt.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Alt.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Alt.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Alt.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Apostrophe_QuotationMark.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Apostrophe_QuotationMark.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Apostrophe_QuotationMark.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Apostrophe_QuotationMark.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Asterisk.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Asterisk.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Asterisk.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Asterisk.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/B.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/B.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/B.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/B.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Backspace.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Backspace.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Backspace.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Backspace.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Blackslash_Pipe.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Blackslash_Pipe.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Blackslash_Pipe.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Blackslash_Pipe.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/C.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/C.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/C.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/C.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CapsLock.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CapsLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CapsLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CapsLock.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretDown.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretDown.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretLeft.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretLeft.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretRight.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretRight.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretUp.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/CaretUp.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Ctrl.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Ctrl.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Ctrl.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Ctrl.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/D.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/D.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/D.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/D.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Delete.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Delete.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Delete.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Delete.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/E.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/E.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/E.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/E.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/End.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/End.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/End.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/End.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/EnterSmall.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/EnterSmall.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/EnterSmall.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/EnterSmall.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Equals_Plus.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Equals_Plus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Equals_Plus.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Equals_Plus.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Escape.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Escape.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Escape.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Escape.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F1.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F1.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F1.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F10.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F10.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F10.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F10.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F11.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F11.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F11.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F11.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F12.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F12.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F12.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F12.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F2.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F2.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F2.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F3.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F3.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F3.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F4.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F4.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F4.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F5.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F5.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F5.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F6.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F6.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F6.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F7.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F7.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F7.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F8.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F8.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F8.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F9.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F9.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/F9.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Function.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Function.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Function.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Function.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/G.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/G.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/G.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/G.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/GreaterThan_Dot.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/GreaterThan_Dot.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/GreaterThan_Dot.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/GreaterThan_Dot.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/H.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/H.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/H.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/H.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Home.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Home.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Home.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Home.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Hyphen_Underscore.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Hyphen_Underscore.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Hyphen_Underscore.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Hyphen_Underscore.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/I.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/I.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/I.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/I.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Insert.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Insert.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Insert.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Insert.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/J.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/J.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/J.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/J.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/K.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/K.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/K.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/K.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/L.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/L.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/L.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/L.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/LessThan_Comma.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/LessThan_Comma.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/LessThan_Comma.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/LessThan_Comma.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/M.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/M.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/M.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/M.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Minus.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Minus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Minus.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Minus.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Mode.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Mode.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Mode.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Mode.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/N.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/N.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/N.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/N.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num0.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num0.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num0.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num0.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num1.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num1.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num1.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num1.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num2.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num2.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num2.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num2.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num3.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num3.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num3.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num3.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num4.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num4.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num4.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num4.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num5.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num5.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num5.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num5.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num6.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num6.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num6.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num6.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num7.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num7.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num7.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num7.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num8.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num8.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num8.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num8.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num9.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num9.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num9.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num9.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumEnter.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumEnter.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumEnter.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumEnter.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumPlus.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumPlus.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumPlus.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/NumPlus.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num_Dot.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num_Dot.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num_Dot.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Num_Dot.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/O.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/O.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/O.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/O.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/P.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/P.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/P.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/P.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageDown.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageDown.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageDown.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageDown.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageUp.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageUp.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageUp.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PageUp.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PauseBreak.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PauseBreak.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PauseBreak.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PauseBreak.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PrintScreen.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PrintScreen.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PrintScreen.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/PrintScreen.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Q.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Q.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Q.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Q.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/QuestionMark_Slash.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/QuestionMark_Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/QuestionMark_Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/QuestionMark_Slash.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/R.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/R.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/R.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/R.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/S.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/S.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/S.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/S.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ScrollLock.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ScrollLock.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ScrollLock.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ScrollLock.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Semicolon_Colon.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Semicolon_Colon.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Semicolon_Colon.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Semicolon_Colon.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Shift.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Shift.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Shift.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Shift.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ShiftBig.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ShiftBig.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ShiftBig.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/ShiftBig.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Slash.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Slash.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Slash.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Slash.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Space.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Space.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Space.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Space.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketLeft_CurlyBracketLeft.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketLeft_CurlyBracketLeft.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketLeft_CurlyBracketLeft.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketLeft_CurlyBracketLeft.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketRight_CurlyBracketRight.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketRight_CurlyBracketRight.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketRight_CurlyBracketRight.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/SquareBracketRight_CurlyBracketRight.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/T.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/T.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/T.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/T.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Tab.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Tab.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Tab.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Tab.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/U.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/U.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/U.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/U.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/V.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/V.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/V.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/V.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/W.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/W.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/W.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/W.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Wooting.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Wooting.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Wooting.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Wooting.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/X.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/X.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/X.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/X.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Y.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Y.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Y.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Y.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Z.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Z.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Z.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/Regular/Z.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGONE.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGONE.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGONE.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGONE.png
diff --git a/src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGTWO.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGTWO.png
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGTWO.png
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/Keyboards/WOOTINGTWO.png
diff --git a/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/empty.png b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/empty.png
new file mode 100644
index 000000000..af367b99a
Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Wooting/Images/Wooting/empty.png differ
diff --git a/src/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGONE/US.xml b/src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGONE/US.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGONE/US.xml
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGONE/US.xml
diff --git a/src/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGTWO/US.xml b/src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGTWO/US.xml
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGTWO/US.xml
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/Layouts/Wooting/Keyboards/WOOTINGTWO/US.xml
diff --git a/src/Plugins/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..387240943
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Wooting/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c6bdb6d9-062d-4c28-a280-f3bd6197f07f")]
diff --git a/src/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs b/src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/WootingDeviceProvider.cs
diff --git a/src/Plugins/Artemis.Plugins.Devices.Wooting/app.config b/src/Plugins/Artemis.Plugins.Devices.Wooting/app.config
new file mode 100644
index 000000000..aed5d2184
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Devices.Wooting/app.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Artemis.Plugins.Devices.Wooting/plugin.json b/src/Plugins/Artemis.Plugins.Devices.Wooting/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/plugin.json
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/plugin.json
diff --git a/src/Artemis.Plugins.Devices.Wooting/x64/wooting-rgb-sdk64.dll b/src/Plugins/Artemis.Plugins.Devices.Wooting/x64/wooting-rgb-sdk64.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/x64/wooting-rgb-sdk64.dll
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/x64/wooting-rgb-sdk64.dll
diff --git a/src/Artemis.Plugins.Devices.Wooting/x86/wooting-rgb-sdk.dll b/src/Plugins/Artemis.Plugins.Devices.Wooting/x86/wooting-rgb-sdk.dll
similarity index 100%
rename from src/Artemis.Plugins.Devices.Wooting/x86/wooting-rgb-sdk.dll
rename to src/Plugins/Artemis.Plugins.Devices.Wooting/x86/wooting-rgb-sdk.dll
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
similarity index 93%
rename from src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
index 4f4a8dc61..896e3dd0c 100644
--- a/src/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
+++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Artemis.Plugins.LayerBrushes.Color.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
@@ -7,6 +7,7 @@
     <Copyright>Copyright © Robert Beekman - 2019</Copyright>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -31,7 +32,7 @@
     <Compile Remove="obj\x64\Debug\ColorBrushView.g.i.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrushProvider.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/Properties/AssemblyInfo.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/app.config b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/app.config
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Color/app.config
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/app.config
diff --git a/src/Artemis.Plugins.LayerBrushes.Color/plugin.json b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Color/plugin.json
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Color/plugin.json
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
similarity index 93%
rename from src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
index 2aacbe759..1e44dc52b 100644
--- a/src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
+++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
@@ -7,6 +7,7 @@
     <Copyright>Copyright ©  2019</Copyright>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -32,7 +33,7 @@
     <Compile Remove="obj\x64\Debug\NoiseBrushView.g.i.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrushProvider.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Properties/AssemblyInfo.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/Utilities/OpenSimplexNoise.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Utilities/OpenSimplexNoise.cs
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/Utilities/OpenSimplexNoise.cs
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/Utilities/OpenSimplexNoise.cs
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/app.config b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/app.config
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/app.config
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/app.config
diff --git a/src/Artemis.Plugins.LayerBrushes.Noise/plugin.json b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.LayerBrushes.Noise/plugin.json
rename to src/Plugins/Artemis.Plugins.LayerBrushes.Noise/plugin.json
diff --git a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
similarity index 82%
rename from src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
rename to src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
index eb8aeae60..3a0227d9f 100644
--- a/src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
+++ b/src/Plugins/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
@@ -7,6 +7,7 @@
     <Copyright>Copyright © Robert Beekman - 2019</Copyright>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugType>full</DebugType>
@@ -21,12 +22,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\GeneralView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="1.68.2-preview.29" />
     <PackageReference Include="Stylet" Version="1.3.1" />
@@ -35,11 +30,7 @@
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Remove="obj\x64\Debug\Views\GeneralView.g.cs" />
-    <Compile Remove="obj\x64\Debug\Views\GeneralView.g.i.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj">
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
       <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/Artemis.Plugins.Modules.General/GeneralDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/GeneralDataModel.cs
similarity index 100%
rename from src/Artemis.Plugins.Modules.General/GeneralDataModel.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/GeneralDataModel.cs
diff --git a/src/Artemis.Plugins.Modules.General/GeneralModule.cs b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
similarity index 95%
rename from src/Artemis.Plugins.Modules.General/GeneralModule.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
index c9a225ca3..5f4c10688 100644
--- a/src/Artemis.Plugins.Modules.General/GeneralModule.cs
+++ b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
 using Artemis.Core.Plugins.Models;
 using Artemis.Plugins.Modules.General.ViewModels;
 
diff --git a/src/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs b/src/Plugins/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/Properties/AssemblyInfo.cs
diff --git a/src/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
similarity index 84%
rename from src/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
index 7bf5365df..316a2205b 100644
--- a/src/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
+++ b/src/Plugins/Artemis.Plugins.Modules.General/ViewModels/GeneralViewModel.cs
@@ -1,4 +1,5 @@
 using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract.ViewModels;
 
 namespace Artemis.Plugins.Modules.General.ViewModels
 {
diff --git a/src/Artemis.Plugins.Modules.General/Views/GeneralView.xaml b/src/Plugins/Artemis.Plugins.Modules.General/Views/GeneralView.xaml
similarity index 100%
rename from src/Artemis.Plugins.Modules.General/Views/GeneralView.xaml
rename to src/Plugins/Artemis.Plugins.Modules.General/Views/GeneralView.xaml
diff --git a/src/Artemis.Plugins.Modules.General/app.config b/src/Plugins/Artemis.Plugins.Modules.General/app.config
similarity index 100%
rename from src/Artemis.Plugins.Modules.General/app.config
rename to src/Plugins/Artemis.Plugins.Modules.General/app.config
diff --git a/src/Artemis.Plugins.Modules.General/plugin.json b/src/Plugins/Artemis.Plugins.Modules.General/plugin.json
similarity index 100%
rename from src/Artemis.Plugins.Modules.General/plugin.json
rename to src/Plugins/Artemis.Plugins.Modules.General/plugin.json