Plugins - Adjusted namespaces

src/Artemis.Core/Constants.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins;
 
 namespace Artemis.Core
 {

src/Artemis.Core/Events/FrameRenderingEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using RGB.NET.Core;
 using SkiaSharp;
 

src/Artemis.Core/Events/PluginEventArgs.cs

@@ -1,5 +1,5 @@
 using System;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins;
 
 namespace Artemis.Core.Events
 {

src/Artemis.Core/Models/Profile/Conditions/DisplayCondition.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq.Expressions;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 
 namespace Artemis.Core.Models.Profile.Conditions
 {

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile.Conditions.Abstract;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs

@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile.Conditions.Abstract;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionOperator.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins;
 using Artemis.Core.Services.Interfaces;
 
 namespace Artemis.Core.Models.Profile.Conditions

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs

@@ -4,7 +4,7 @@ using System.Linq.Expressions;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile.Conditions.Abstract;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;

src/Artemis.Core/Models/Profile/Folder.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
+using Artemis.Core.Plugins.LayerEffects;
 using Artemis.Core.Utilities;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;

src/Artemis.Core/Models/Profile/Layer.cs

@@ -7,8 +7,9 @@ using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Models.Profile.LayerShapes;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
+using Artemis.Core.Plugins.LayerEffects;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;

src/Artemis.Core/Models/Profile/LayerBrushReference.cs

@@ -1,5 +1,5 @@
 using System;
-using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrushes;
 
 namespace Artemis.Core.Models.Profile
 {

src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs

@@ -8,8 +8,9 @@ using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
+using Artemis.Core.Plugins.LayerEffects;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
 

src/Artemis.Core/Models/Profile/Profile.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
-using Artemis.Core.Plugins.Models;
 using Artemis.Storage.Entities.Profile;
 using SkiaSharp;
 

src/Artemis.Core/Models/Profile/ProfileDescriptor.cs

@@ -1,5 +1,5 @@
 using System;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Storage.Entities.Profile;
 
 namespace Artemis.Core.Models.Profile

src/Artemis.Core/Models/Profile/RenderProfileElement.cs

@@ -5,8 +5,7 @@ using System.Linq;
 using Artemis.Core.Annotations;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerEffects;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;
 using SkiaSharp;

src/Artemis.Core/Models/Surface/ArtemisDevice.cs

@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
 using Artemis.Storage.Entities.Surface;
 using RGB.NET.Core;
 using SkiaSharp;

src/Artemis.Core/Ninject/CoreModule.cs

@@ -1,6 +1,6 @@
 using System.IO;
 using Artemis.Core.Exceptions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage;
 using Artemis.Storage.Migrations.Interfaces;

src/Artemis.Core/Ninject/PluginSettingsProvider.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Artemis.Core.Exceptions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;
 using Ninject.Activation;

src/Artemis.Core/Ninject/SettingsServiceProvider.cs

@@ -1,6 +1,6 @@
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Ninject;
 using Ninject.Activation;

src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelIgnoreAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.Plugins.Abstract.DataModels.Attributes
+namespace Artemis.Core.Plugins.DataModelExpansions.Attributes
 {
     public class DataModelIgnoreAttribute : Attribute
     {

src/Artemis.Core/Plugins/DataModelExpansions/Attributes/DataModelProperty.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.Plugins.Abstract.DataModels.Attributes
+namespace Artemis.Core.Plugins.DataModelExpansions.Attributes
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class DataModelPropertyAttribute : Attribute

src/Artemis.Core/Plugins/DataModelExpansions/BaseDataModelExpansion.cs

@@ -4,11 +4,10 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
 using Artemis.Core.Utilities;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.DataModelExpansions
 {
     /// <summary>
     ///     Allows you to expand the application-wide datamodel

src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs

@@ -4,12 +4,11 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Artemis.Core.Exceptions;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Modules;
 
-namespace Artemis.Core.Plugins.Abstract.DataModels
+namespace Artemis.Core.Plugins.DataModelExpansions
 {
     public abstract class DataModel
     {

src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs

@@ -5,7 +5,7 @@ using Ninject;
 using RGB.NET.Core;
 using Serilog;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.DeviceProviders
 {
     /// <inheritdoc />
     /// <summary>

src/Artemis.Core/Plugins/Exceptions/ArtemisPluginException.cs

@@ -1,5 +1,4 @@
 using System;
-using Artemis.Core.Plugins.Models;
 
 namespace Artemis.Core.Plugins.Exceptions
 {

src/Artemis.Core/Plugins/LayerBrushes/BrushConfigurationViewModel.cs

@@ -1,7 +1,7 @@
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
 using Stylet;
 
-namespace Artemis.Core.Plugins.Abstract.ViewModels
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     public abstract class BrushConfigurationViewModel : Screen
     {

src/Artemis.Core/Plugins/LayerBrushes/Internal/BaseLayerBrush.cs

@@ -1,12 +1,11 @@
 using System;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using SkiaSharp;
 using Stylet;
 
-namespace Artemis.Core.Plugins.LayerBrush.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes.Internal
 {
     /// <summary>
     ///     For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead

src/Artemis.Core/Plugins/LayerBrushes/Internal/PropertiesLayerBrush.cs

@@ -3,7 +3,7 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Exceptions;
 using Artemis.Core.Services.Interfaces;
 
-namespace Artemis.Core.Plugins.LayerBrush.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes.Internal
 {
     /// <summary>
     ///     For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead

src/Artemis.Core/Plugins/LayerBrushes/LayerBrush.cs

@@ -1,8 +1,9 @@
 using Artemis.Core.Models.Profile;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
 using Artemis.Core.Services.Interfaces;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     public abstract class LayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
     {

src/Artemis.Core/Plugins/LayerBrushes/LayerBrushConfigurationDialog.cs

@@ -1,8 +1,7 @@
 using System;
-using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     /// <inheritdoc />
     public class LayerBrushConfigurationDialog<T> : LayerBrushConfigurationDialog where T : BrushConfigurationViewModel

src/Artemis.Core/Plugins/LayerBrushes/LayerBrushDescriptor.cs

@@ -1,7 +1,6 @@
 using System;
-using Artemis.Core.Plugins.Abstract;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     /// <summary>
     ///     A class that describes a layer brush

src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs

@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     /// <summary>
     ///     Allows you to create one or more <see cref="LayerBrush{T}" />s usable by profile layers.

src/Artemis.Core/Plugins/LayerBrushes/PerLedLayerBrush.cs

@@ -1,9 +1,10 @@
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
 using Artemis.Core.Services.Interfaces;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     public abstract class PerLedLayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
     {

src/Artemis.Core/Plugins/LayerBrushes/RgbNetLayerBrush.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Linq;
 using Artemis.Core.Models.Profile;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
 using Artemis.Core.Services.Interfaces;
 using RGB.NET.Core;
 using RGB.NET.Groups;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush.Abstract
+namespace Artemis.Core.Plugins.LayerBrushes
 {
     /// <summary>
     ///     An RGB.NET brush that uses RGB.NET's per-LED rendering engine.

src/Artemis.Core/Plugins/LayerEffects/EffectConfigurationViewModel.cs

@@ -1,7 +1,6 @@
-using Artemis.Core.Plugins.LayerEffect.Abstract;
+using Stylet;
-using Stylet;
 
-namespace Artemis.Core.Plugins.Abstract.ViewModels
+namespace Artemis.Core.Plugins.LayerEffects
 {
     public abstract class EffectConfigurationViewModel : Screen
     {

src/Artemis.Core/Plugins/LayerEffects/Internal/BaseLayerEffect.cs

@@ -1,14 +1,13 @@
 using System;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using SkiaSharp;
 using Stylet;
 
-namespace Artemis.Core.Plugins.LayerEffect.Abstract
+namespace Artemis.Core.Plugins.LayerEffects
 {
     /// <summary>
-    ///     For internal use only, please use <see cref="LayerEffect" /> instead
+    ///     For internal use only, please use <see cref="LayerEffect{T}" /> instead
     /// </summary>
     public abstract class BaseLayerEffect : PropertyChangedBase, IDisposable
     {
@@ -114,12 +113,12 @@ namespace Artemis.Core.Plugins.LayerEffect.Abstract
         }
 
         /// <summary>
-        ///     Called when the layer brush is activated
+        ///     Called when the layer effect is activated
         /// </summary>
         public abstract void EnableLayerEffect();
 
         /// <summary>
-        ///     Called when the layer brush is deactivated
+        ///     Called when the layer effect is deactivated
         /// </summary>
         public abstract void DisableLayerEffect();
 

src/Artemis.Core/Plugins/LayerEffects/LayerEffect.cs

@@ -2,13 +2,9 @@
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Exceptions;
 using Artemis.Core.Services.Interfaces;
-using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerEffect.Abstract
+namespace Artemis.Core.Plugins.LayerEffects
 {
-    /// <summary>
-    ///     For internal use only, please use <see cref="LayerEffect" /> instead
-    /// </summary>
     public abstract class LayerEffect<T> : BaseLayerEffect where T : LayerPropertyGroup
     {
         private T _properties;

src/Artemis.Core/Plugins/LayerEffects/LayerEffectConfigurationDialog.cs

@@ -1,8 +1,6 @@
 using System;
-using Artemis.Core.Plugins.Abstract.ViewModels;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
 
-namespace Artemis.Core.Plugins.LayerEffect
+namespace Artemis.Core.Plugins.LayerEffects
 {
     /// <inheritdoc />
     public class LayerEffectConfigurationDialog<T> : LayerEffectConfigurationDialog where T : EffectConfigurationViewModel

src/Artemis.Core/Plugins/LayerEffects/LayerEffectDescriptor.cs

@@ -1,7 +1,6 @@
 using System;
-using Artemis.Core.Plugins.Abstract;
 
-namespace Artemis.Core.Plugins.LayerEffect
+namespace Artemis.Core.Plugins.LayerEffects
 {
     /// <summary>
     ///     A class that describes a layer effect

src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs

@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.LayerEffect;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.LayerEffects
 {
     /// <summary>
     ///     Allows you to register one or more <see cref="LayerEffect{T}" />s usable by profile layers.

src/Artemis.Core/Plugins/Modules/ActivationRequirements/BooleanActivationRequirement.cs

@@ -0,0 +1,19 @@
+namespace Artemis.Core.Plugins.Modules.ActivationRequirements
+{
+    /// <summary>
+    ///     Evaluates to true or false by returning the value of ActivationMet
+    /// </summary>
+    public class BooleanActivationRequirement : IModuleActivationRequirement
+    {
+        /// <summary>
+        ///     Gets or sets whether the activation requirement is met
+        /// </summary>
+        public bool ActivationMet { get; set; }
+
+        /// <inheritdoc />
+        public bool Evaluate()
+        {
+            return ActivationMet;
+        }
+    }
+}

src/Artemis.Core/Plugins/Modules/ActivationRequirements/IModuleActivationRequirement.cs

@@ -0,0 +1,14 @@
+namespace Artemis.Core.Plugins.Modules.ActivationRequirements
+{
+    /// <summary>
+    ///     Evaluates to true or false by checking requirements specific to the implementation
+    /// </summary>
+    public interface IModuleActivationRequirement
+    {
+        /// <summary>
+        ///     Called to determine whether the activation requirement is met
+        /// </summary>
+        /// <returns></returns>
+        bool Evaluate();
+    }
+}

src/Artemis.Core/Plugins/Modules/ActivationRequirements/ProcessActivationRequirement.cs

@@ -3,34 +3,44 @@ using System.IO;
 using System.Linq;
 using Artemis.Core.Extensions;
 
-namespace Artemis.Core.Plugins.Modules
+namespace Artemis.Core.Plugins.Modules.ActivationRequirements
 {
+    /// <summary>
+    ///     Evaluates to true or false by checking if the specified process is running
+    /// </summary>
     public class ProcessActivationRequirement : IModuleActivationRequirement
     {
-        public string ProcessName { get; set; }
+        /// <summary>
-        public string Location { get; set; }
+        ///     Creates a new instance of the <see cref="ProcessActivationRequirement" /> class
-
+        /// </summary>
+        /// <param name="processName">The name of the process that must run</param>
+        /// <param name="location">The location of where the process must be running from (optional)</param>
         public ProcessActivationRequirement(string processName, string location = null)
         {
             ProcessName = processName;
             Location = location;
         }
 
+        /// <summary>
+        ///     The name of the process that must run
+        /// </summary>
+        public string ProcessName { get; set; }
 
+        /// <summary>
+        ///     The location of where the process must be running from
+        /// </summary>
+        public string Location { get; set; }
+
+        /// <inheritdoc />
         public bool Evaluate()
         {
             if (ProcessName == null && Location == null)
                 return false;
 
             var processes = ProcessName != null ? Process.GetProcessesByName(ProcessName).Where(p => !p.HasExited) : Process.GetProcesses().Where(p => !p.HasExited);
-            return Location != null 
+            return Location != null
                 ? processes.Any(p => Path.GetDirectoryName(p.GetProcessFilename()) == Location)
                 : processes.Any();
         }
     }
-
-    public interface IModuleActivationRequirement
-    {
-        bool Evaluate();
-    }
 }

src/Artemis.Core/Plugins/Modules/Module.cs

@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
-using Artemis.Core.Plugins.Modules;
+using Artemis.Core.Plugins.Modules.ActivationRequirements;
 using Artemis.Storage.Entities.Module;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.Modules
 {
     /// <summary>
     ///     Allows you to add support for new games/applications while utilizing your own data model

src/Artemis.Core/Plugins/Modules/ModuleTab.cs

@@ -1,6 +1,4 @@
 using System;
-using Artemis.Core.Plugins.Abstract;
-using Artemis.Core.Plugins.Abstract.ViewModels;
 
 namespace Artemis.Core.Plugins.Modules
 {

src/Artemis.Core/Plugins/Modules/ModuleViewModel.cs

@@ -1,6 +1,6 @@
 using Stylet;
 
-namespace Artemis.Core.Plugins.Abstract.ViewModels
+namespace Artemis.Core.Plugins.Modules
 {
     /// <summary>
     /// The base class for any view model that belongs to a module

src/Artemis.Core/Plugins/Modules/ProfileModule.cs

@@ -8,12 +8,12 @@ using System.Threading.Tasks;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.Core.Utilities;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.Modules
 {
     /// <summary>
     ///     Allows you to add support for new games/applications while utilizing Artemis' profile engine and your own data

src/Artemis.Core/Plugins/Plugin.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using Artemis.Core.Plugins.Abstract.ViewModels;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins
 {
     /// <summary>
     ///     This is the base plugin type, use the other interfaces such as Module to create plugins

src/Artemis.Core/Plugins/PluginConfigurationDialog.cs

@@ -1,7 +1,6 @@
 using System;
-using Artemis.Core.Plugins.Abstract.ViewModels;
 
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins
 {
     /// <inheritdoc />
     public class PluginConfigurationDialog<T> : PluginConfigurationDialog where T : PluginConfigurationViewModel

src/Artemis.Core/Plugins/PluginConfigurationViewModel.cs

@@ -1,6 +1,6 @@
 using Stylet;
 
-namespace Artemis.Core.Plugins.Abstract.ViewModels
+namespace Artemis.Core.Plugins
 {
     public abstract class PluginConfigurationViewModel : Screen
     {

src/Artemis.Core/Plugins/PluginInfo.cs

@@ -1,13 +1,12 @@
 using System;
 using System.IO;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract;
 using Artemis.Storage.Entities.Plugins;
 using McMaster.NETCore.Plugins;
 using Newtonsoft.Json;
 using Stylet;
 
-namespace Artemis.Core.Plugins.Models
+namespace Artemis.Core.Plugins
 {
     [JsonObject(MemberSerialization.OptIn)]
     public class PluginInfo : PropertyChangedBase

src/Artemis.Core/Plugins/Settings/PluginSetting.cs

@@ -4,7 +4,7 @@ using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
 using Stylet;
 
-namespace Artemis.Core.Plugins.Models
+namespace Artemis.Core.Plugins.Settings
 {
     public class PluginSetting<T> : PropertyChangedBase
     {

src/Artemis.Core/Plugins/Settings/PluginSettings.cs

@@ -3,7 +3,7 @@ using Artemis.Storage.Entities.Plugins;
 using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
 
-namespace Artemis.Core.Plugins.Models
+namespace Artemis.Core.Plugins.Settings
 {
     /// <summary>
     ///     <para>This contains all the settings for your plugin. To access a setting use <see cref="GetSetting{T}" />.</para>

src/Artemis.Core/RGB.NET/BitmapBrush.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using RGB.NET.Core;
 using SkiaSharp;
 

src/Artemis.Core/Services/CoreService.cs

@@ -9,8 +9,8 @@ using Artemis.Core.Exceptions;
 using Artemis.Core.JsonConverters;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Ninject;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.Core.Utilities;
@@ -20,7 +20,7 @@ using RGB.NET.Core;
 using Serilog;
 using Serilog.Events;
 using SkiaSharp;
-using Module = Artemis.Core.Plugins.Abstract.Module;
+using Module = Artemis.Core.Plugins.Modules.Module;
 
 namespace Artemis.Core.Services
 {

src/Artemis.Core/Services/DataModelService.cs

@@ -7,10 +7,10 @@ using Artemis.Core.Exceptions;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Models.Profile.Conditions.Operators;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
 using Newtonsoft.Json;
 using Serilog;

src/Artemis.Core/Services/Interfaces/IDataModelService.cs

@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using Artemis.Core.Annotations;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.Models;
 using Newtonsoft.Json;
 
 namespace Artemis.Core.Services.Interfaces

src/Artemis.Core/Services/Interfaces/IPluginService.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Artemis.Core.Events;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Models;
 using RGB.NET.Core;
 
 namespace Artemis.Core.Services.Interfaces

src/Artemis.Core/Services/Interfaces/IRenderElementService.cs

@@ -1,8 +1,7 @@
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
-using Artemis.Core.Plugins.LayerEffect;
+using Artemis.Core.Plugins.LayerEffects;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
 
 namespace Artemis.Core.Services.Interfaces
 {

src/Artemis.Core/Services/ModuleService.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Timers;
 using Artemis.Core.Events;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;

src/Artemis.Core/Services/PluginService.cs

@@ -6,9 +6,9 @@ using System.Reflection;
 using Artemis.Core.Events;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
+using Artemis.Core.Plugins.DeviceProviders;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Utilities;
 using Artemis.Storage.Entities.Plugins;

src/Artemis.Core/Services/RenderElementService.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
+using Artemis.Core.Plugins.LayerBrushes.Internal;
-using Artemis.Core.Plugins.LayerEffect;
+using Artemis.Core.Plugins.LayerEffects;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
 using Ninject;

src/Artemis.Core/Services/RgbService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Artemis.Core.Events;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.RGB.NET;
 using Artemis.Core.Services.Interfaces;
 using RGB.NET.Core;

src/Artemis.Core/Services/SettingsService.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;
 

src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
 
 namespace Artemis.Core.Services.Storage.Interfaces

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -6,8 +6,9 @@ using Artemis.Core.Events;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerEffect.Abstract;
+using Artemis.Core.Plugins.LayerEffects;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.Storage.Entities.Profile;

src/Artemis.Core/Services/Storage/SurfaceService.cs

@@ -6,7 +6,7 @@ using Artemis.Core.Events;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;

src/Artemis.Core/Utilities/IntroAnimation.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Linq;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.Storage.Entities.Profile;
 using Newtonsoft.Json;

src/Artemis.UI.Shared/DataModelVisualization/DataModelInputViewModel.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Stylet;
 
 namespace Artemis.UI.Shared.DataModelVisualization

src/Artemis.UI.Shared/DataModelVisualization/DataModelVisualizationRegistration.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Artemis.Core;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertiesViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListPropertyViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Reflection;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.UI.Shared.Services;
 using Stylet;
 

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization.Shared

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs

@@ -6,8 +6,8 @@ using System.Reflection;
 using System.Windows.Documents;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.UI.Shared.Exceptions;
 using Artemis.UI.Shared.Services;
 using Humanizer;

src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs

@@ -1,6 +1,6 @@
 using System;
 using Artemis.Core;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins;
 using Artemis.UI.Shared.Services.Interfaces;
 
 namespace Artemis.UI.Shared.PropertyInput

src/Artemis.UI.Shared/Services/DataModelVisualization/ListDataModelWrapper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.Core.Plugins.DataModelExpansions;
 
 namespace Artemis.UI.Shared.Services.DataModelVisualization
 {

src/Artemis.UI.Shared/Services/DataModelVisualizationService.cs

@@ -3,10 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Shared.DataModelVisualization;
 using Artemis.UI.Shared.DataModelVisualization.Shared;

src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Modules;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.PropertyInput;
 using Ninject;

src/Artemis.UI.Shared/Services/ProfileEditorService.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
 using Artemis.Core.Plugins.Exceptions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.PropertyInput;

src/Artemis.UI/DataModelVisualization/Input/DoubleDataModelInputViewModel.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.UI.Shared.DataModelVisualization;
 
 namespace Artemis.UI.DataModelVisualization.Input

src/Artemis.UI/DataModelVisualization/Input/IntDataModelInputViewModel.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 using System.Windows.Input;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.UI.Shared.DataModelVisualization;
 
 namespace Artemis.UI.DataModelVisualization.Input

src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.Core.Plugins.DataModelExpansions.Attributes;
 using Artemis.UI.Shared.DataModelVisualization;
 
 namespace Artemis.UI.DataModelVisualization.Input

src/Artemis.UI/Ninject/Factories/IVMFactory.cs

@@ -3,7 +3,8 @@ using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins;
+using Artemis.Core.Plugins.Modules;
 using Artemis.UI.Screens.Module;
 using Artemis.UI.Screens.ProfileEditor;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions;

src/Artemis.UI/PropertyInput/BrushPropertyInputView.xaml

@@ -5,8 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
-             xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrush;assembly=Artemis.Core"
              xmlns:dataTemplateSelectors="clr-namespace:Artemis.UI.DataTemplateSelectors"
+             xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrushes;assembly=Artemis.Core"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type propertyInput:BrushPropertyInputViewModel}}">

src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs

@@ -3,8 +3,7 @@ using System.Linq;
 using Artemis.Core.Events;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Plugins.LayerBrush;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Shared.PropertyInput;
 using Artemis.UI.Shared.Services.Interfaces;

src/Artemis.UI/Screens/Module/ModuleRootViewModel.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Artemis.Core.Plugins.Abstract;
-using Artemis.Core.Plugins.Abstract.ViewModels;
 using Artemis.Core.Plugins.Modules;
 using Artemis.UI.Ninject.Factories;
 using Ninject;
@@ -16,7 +14,7 @@ namespace Artemis.UI.Screens.Module
         private readonly IProfileEditorVmFactory _profileEditorVmFactory;
         private readonly IKernel _kernel;
 
-        public ModuleRootViewModel(Core.Plugins.Abstract.Module module, IProfileEditorVmFactory profileEditorVmFactory, IKernel kernel)
+        public ModuleRootViewModel(Core.Plugins.Modules.Module module, IProfileEditorVmFactory profileEditorVmFactory, IKernel kernel)
         {
             DisplayName = module?.DisplayName;
             Module = module;
@@ -27,7 +25,7 @@ namespace Artemis.UI.Screens.Module
             Task.Run(AddTabsAsync);
         }
 
-        public Core.Plugins.Abstract.Module Module { get; }
+        public Core.Plugins.Modules.Module Module { get; }
 
         private async Task AddTabsAsync()
         {

src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Shared.Services.Dialog;
 using ICSharpCode.AvalonEdit.Document;

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs

@@ -6,7 +6,7 @@ using System.Timers;
 using System.Windows;
 using System.Windows.Input;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Timers;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs

@@ -6,7 +6,7 @@ using System.Timers;
 using System.Windows;
 using System.Windows.Input;
 using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;

src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.LayerBrushes;
 using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor

src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs

@@ -1,4 +1,4 @@
-using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.LayerEffects;
 using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml

@@ -5,9 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:layerEffect="clr-namespace:Artemis.Core.Plugins.LayerEffect;assembly=Artemis.Core"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
+             xmlns:layerEffect="clr-namespace:Artemis.Core.Plugins.LayerEffects;assembly=Artemis.Core"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:EffectsViewModel}">

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs

@@ -2,8 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.LayerEffects;
-using Artemis.Core.Plugins.LayerEffect;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Artemis.Core.Plugins.Abstract.ViewModels;
+using Artemis.Core.Plugins.LayerBrushes;
+using Artemis.Core.Plugins.LayerEffects;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Screens.ProfileEditor.Dialogs;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml

@@ -8,7 +8,6 @@
              xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.ProfileEditor"
              xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
              xmlns:profile="clr-namespace:Artemis.Core.Models.Profile;assembly=Artemis.Core"
-             xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrush;assembly=Artemis.Core"
              xmlns:dataTemplateSelectors="clr-namespace:Artemis.UI.DataTemplateSelectors"
              mc:Ignorable="d"
              behaviors:InputBindingBehavior.PropagateInputBindingsToWindow="True"

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Modules;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Screens.ProfileEditor.Dialogs;

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs

@@ -6,7 +6,7 @@ using System.Windows.Input;
 using Artemis.Core.Events;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Settings;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Events;