From 11327eb2ca0268334c17cbf2d43a8d0e523ec40c Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 13 Nov 2020 19:59:01 +0100
Subject: [PATCH] Default types - Adjusted namespaces

---
 src/Artemis.Core/Artemis.Core.csproj.DotSettings              | 1 +
 .../Conditions/Operators/EqualsConditionOperator.cs           | 2 +-
 .../Conditions/Operators/GreaterThanConditionOperator.cs      | 2 +-
 .../Operators/GreaterThanOrEqualConditionOperator.cs          | 2 +-
 .../Conditions/Operators/LessThanConditionOperator.cs         | 2 +-
 .../Conditions/Operators/LessThanOrEqualConditionOperator.cs  | 2 +-
 .../Conditions/Operators/NotEqualConditionOperator.cs         | 2 +-
 .../Conditions/Operators/NotNullConditionOperator.cs          | 2 +-
 .../Conditions/Operators/NullConditionOperator.cs             | 2 +-
 .../Conditions/Operators/NumberEqualsConditionOperator.cs     | 2 +-
 .../Conditions/Operators/NumberNotEqualConditionOperator.cs   | 2 +-
 .../Conditions/Operators/StringContainsConditionOperator.cs   | 2 +-
 .../Conditions/Operators/StringEndsWithConditionOperator.cs   | 2 +-
 .../Conditions/Operators/StringEqualsConditionOperator.cs     | 2 +-
 .../Operators/StringMatchesRegexConditionOperator.cs          | 2 +-
 .../Operators/StringNotContainsConditionOperator.cs           | 2 +-
 .../Conditions/Operators/StringNotEqualConditionOperator.cs   | 2 +-
 .../Conditions/Operators/StringStartsWithConditionOperator.cs | 2 +-
 .../DataBindings/Converters/FloatDataBindingConverter.cs      | 2 +-
 .../DataBindings/Converters/GeneralDataBindingConverter.cs    | 2 +-
 .../DataBindings/Converters/IntDataBindingConverter.cs        | 2 +-
 .../DataBindings/Converters/SKColorDataBindingConverter.cs    | 2 +-
 .../Modifiers/Colors/SKColorBrightenModifierType.cs           | 2 +-
 .../Modifiers/Colors/SKColorDarkenModifierType.cs             | 2 +-
 .../Modifiers/Colors/SKColorDesaturateModifierType.cs         | 2 +-
 .../Modifiers/Colors/SKColorInvertModifierType.cs             | 2 +-
 .../Modifiers/Colors/SKColorRotateHueModifierType.cs          | 2 +-
 .../Modifiers/Colors/SKColorSaturateModifierType.cs           | 2 +-
 .../DataBindings/Modifiers/Colors/SKColorSumModifierType.cs   | 2 +-
 .../DataBindings/Modifiers/Numbers/AbsoluteModifierType.cs    | 2 +-
 .../DataBindings/Modifiers/Numbers/DivideModifierType.cs      | 2 +-
 .../DataBindings/Modifiers/Numbers/MaxModifierType.cs         | 2 +-
 .../DataBindings/Modifiers/Numbers/MinModifierType.cs         | 2 +-
 .../DataBindings/Modifiers/Numbers/ModuloModifierType.cs      | 2 +-
 .../DataBindings/Modifiers/Numbers/MultiplicationModifier.cs  | 2 +-
 .../Modifiers/Numbers/PercentageOfModifierType.cs             | 2 +-
 .../DataBindings/Modifiers/Numbers/PowerModifierType.cs       | 2 +-
 .../Modifiers/Numbers/Rounding/CeilingModifierType.cs         | 2 +-
 .../Modifiers/Numbers/Rounding/FloorModifierType.cs           | 2 +-
 .../Modifiers/Numbers/Rounding/RoundModifierType.cs           | 2 +-
 .../DataBindings/Modifiers/Numbers/SquareRootModifierType.cs  | 2 +-
 .../DataBindings/Modifiers/Numbers/SubtractModifierType.cs    | 2 +-
 .../DataBindings/Modifiers/Numbers/SumModifierType.cs         | 2 +-
 .../Modifiers/Numbers/Trigonometry/CosecantModifierType.cs    | 2 +-
 .../Modifiers/Numbers/Trigonometry/CosineModifierType.cs      | 2 +-
 .../Modifiers/Numbers/Trigonometry/CotangentModifierType.cs   | 2 +-
 .../Modifiers/Numbers/Trigonometry/SecantModifierType.cs      | 2 +-
 .../Modifiers/Numbers/Trigonometry/SineModifierType.cs        | 2 +-
 .../Modifiers/Numbers/Trigonometry/TangentModifierType.cs     | 2 +-
 src/Artemis.Core/DefaultTypes/Properties/BoolLayerProperty.cs | 2 +-
 .../DefaultTypes/Properties/ColorGradientLayerProperty.cs     | 2 +-
 src/Artemis.Core/DefaultTypes/Properties/EnumLayerProperty.cs | 2 +-
 .../DefaultTypes/Properties/FloatLayerProperty.cs             | 4 +---
 .../DefaultTypes/Properties/FloatRangeLayerProperty.cs        | 2 +-
 src/Artemis.Core/DefaultTypes/Properties/IntLayerProperty.cs  | 2 +-
 .../DefaultTypes/Properties/IntRangeLayerProperty.cs          | 4 +---
 .../Properties/LayerBrushReferenceLayerProperty.cs            | 2 +-
 .../DefaultTypes/Properties/SKColorLayerProperty.cs           | 2 +-
 .../DefaultTypes/Properties/SKPointLayerProperty.cs           | 2 +-
 .../DefaultTypes/Properties/SKSizeLayerProperty.cs            | 2 +-
 src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs     | 3 +--
 src/Artemis.Core/Models/Profile/LayerTransformProperties.cs   | 3 +--
 .../Services/Registration/ConditionOperatorService.cs         | 1 -
 src/Artemis.Core/Services/Registration/DataBindingService.cs  | 1 -
 64 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/src/Artemis.Core/Artemis.Core.csproj.DotSettings b/src/Artemis.Core/Artemis.Core.csproj.DotSettings
index 5963c6027..006fb1134 100644
--- a/src/Artemis.Core/Artemis.Core.csproj.DotSettings
+++ b/src/Artemis.Core/Artemis.Core.csproj.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=defaulttypes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cconditions_005Cwrappers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cdatabindings_005Cmodes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cdatabindings_005Cmodes_005Cconditional/@EntryIndexedValue">True</s:Boolean>
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/EqualsConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/EqualsConditionOperator.cs
index dc66e12a3..789f86d63 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/EqualsConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/EqualsConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class EqualsConditionOperator : ConditionOperator<object, object>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanConditionOperator.cs
index de5e61ea3..f9a898107 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class GreaterThanConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanOrEqualConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanOrEqualConditionOperator.cs
index a62b19fda..f0a1bf2b9 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanOrEqualConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/GreaterThanOrEqualConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class GreaterThanOrEqualConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanConditionOperator.cs
index bad93babc..720cd7c2c 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class LessThanConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanOrEqualConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanOrEqualConditionOperator.cs
index 98cb11fca..925a4afaa 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanOrEqualConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/LessThanOrEqualConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class LessThanOrEqualConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotEqualConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotEqualConditionOperator.cs
index 502888ee0..4eeb8441a 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotEqualConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotEqualConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class NotEqualConditionOperator : ConditionOperator<object, object>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotNullConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotNullConditionOperator.cs
index faf7e7054..0d8599df7 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotNullConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NotNullConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class NotNullConditionOperator : ConditionOperator<object>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NullConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NullConditionOperator.cs
index 27a29508f..46302a5ff 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NullConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NullConditionOperator.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class NullConditionOperator : ConditionOperator<object>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberEqualsConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberEqualsConditionOperator.cs
index c0f303553..d32104262 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberEqualsConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberEqualsConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class NumberEqualsConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberNotEqualConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberNotEqualConditionOperator.cs
index 6f5208cea..c0c29bb7a 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberNotEqualConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/NumberNotEqualConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class NumberNotEqualConditionOperator : ConditionOperator<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringContainsConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringContainsConditionOperator.cs
index c108e7b5b..7df8eb9dc 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringContainsConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringContainsConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringContainsConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEndsWithConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEndsWithConditionOperator.cs
index 603660672..b8f5f91d0 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEndsWithConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEndsWithConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringEndsWithConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEqualsConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEqualsConditionOperator.cs
index 09bdbb502..970f96806 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEqualsConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringEqualsConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringEqualsConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringMatchesRegexConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringMatchesRegexConditionOperator.cs
index 8b2c425c7..ada76f5f0 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringMatchesRegexConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringMatchesRegexConditionOperator.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Artemis.Core.DefaultTypes {
+namespace Artemis.Core {
     internal class StringMatchesRegexConditionOperator : ConditionOperator<string, string>
     {
         public override string Description => "Matches Regex";
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotContainsConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotContainsConditionOperator.cs
index a15271341..f5b32c35c 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotContainsConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotContainsConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringNotContainsConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotEqualConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotEqualConditionOperator.cs
index 17b99227b..f51b63c4b 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotEqualConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringNotEqualConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringNotEqualConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringStartsWithConditionOperator.cs b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringStartsWithConditionOperator.cs
index 538692baa..d43b6af20 100644
--- a/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringStartsWithConditionOperator.cs
+++ b/src/Artemis.Core/DefaultTypes/Conditions/Operators/StringStartsWithConditionOperator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class StringStartsWithConditionOperator : ConditionOperator<string, string>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/FloatDataBindingConverter.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/FloatDataBindingConverter.cs
index 1a4c09f4e..9ffb4ec37 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/FloatDataBindingConverter.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/FloatDataBindingConverter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class FloatDataBindingConverter : FloatDataBindingConverter<float>
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/GeneralDataBindingConverter.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/GeneralDataBindingConverter.cs
index fed1be236..b5672f3b1 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/GeneralDataBindingConverter.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/GeneralDataBindingConverter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <summary>
     ///     Represents a generic data binding converter that acts as the bridge between a
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/IntDataBindingConverter.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/IntDataBindingConverter.cs
index 879d2884f..795145630 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/IntDataBindingConverter.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/IntDataBindingConverter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class IntDataBindingConverter : IntDataBindingConverter<int>
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/SKColorDataBindingConverter.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/SKColorDataBindingConverter.cs
index 917bc1ca8..003e06fa0 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Converters/SKColorDataBindingConverter.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Converters/SKColorDataBindingConverter.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class SKColorDataBindingConverter : DataBindingConverter<SKColor, SKColor>
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorBrightenModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorBrightenModifierType.cs
index c99e407f3..32c4255ca 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorBrightenModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorBrightenModifierType.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorBrightenModifierType : DataBindingModifierType<SKColor, float>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDarkenModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDarkenModifierType.cs
index a6ae0a1df..d26993e58 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDarkenModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDarkenModifierType.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorDarkenModifierType : DataBindingModifierType<SKColor, float>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDesaturateModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDesaturateModifierType.cs
index 14c9d8790..e3d370ebd 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDesaturateModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorDesaturateModifierType.cs
@@ -1,7 +1,7 @@
 using System;
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorDesaturateModifierType : DataBindingModifierType<SKColor, float>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorInvertModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorInvertModifierType.cs
index 804c551fc..bc46a053d 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorInvertModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorInvertModifierType.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorInvertModifierType : DataBindingModifierType<SKColor>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorRotateHueModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorRotateHueModifierType.cs
index 24b787f16..45781ce48 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorRotateHueModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorRotateHueModifierType.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorRotateHueModifierType : DataBindingModifierType<SKColor, float>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSaturateModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSaturateModifierType.cs
index 750915da6..751f96c24 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSaturateModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSaturateModifierType.cs
@@ -1,7 +1,7 @@
 using System;
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorSaturateModifierType : DataBindingModifierType<SKColor, float>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSumModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSumModifierType.cs
index 294c368d6..9c45436df 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSumModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Colors/SKColorSumModifierType.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SKColorSumModifierType : DataBindingModifierType<SKColor, SKColor>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/AbsoluteModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/AbsoluteModifierType.cs
index cf4aba7bc..c58bfd3b8 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/AbsoluteModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/AbsoluteModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class AbsoluteModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/DivideModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/DivideModifierType.cs
index ce87e4158..215952095 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/DivideModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/DivideModifierType.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class DivideModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MaxModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MaxModifierType.cs
index edd978108..f8da7936e 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MaxModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MaxModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class MaxModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MinModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MinModifierType.cs
index 2b2913d9f..5ab519e01 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MinModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MinModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class MinModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/ModuloModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/ModuloModifierType.cs
index b378f3174..8b710d3bf 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/ModuloModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/ModuloModifierType.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class ModuloModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MultiplicationModifier.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MultiplicationModifier.cs
index 9992868e6..3198777cc 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MultiplicationModifier.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/MultiplicationModifier.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class MultiplicationModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PercentageOfModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PercentageOfModifierType.cs
index bf435ca11..298d26e30 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PercentageOfModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PercentageOfModifierType.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class PercentageOfModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PowerModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PowerModifierType.cs
index c5338510d..2ea1a0709 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PowerModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/PowerModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class PowerModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/CeilingModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/CeilingModifierType.cs
index a3f71d8e3..c4ca8f021 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/CeilingModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/CeilingModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class CeilingModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/FloorModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/FloorModifierType.cs
index 77882edfe..e26173049 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/FloorModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/FloorModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class FloorModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/RoundModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/RoundModifierType.cs
index b45f8fbd5..3b3283396 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/RoundModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Rounding/RoundModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class RoundModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SquareRootModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SquareRootModifierType.cs
index fa8daed13..72dfa3f55 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SquareRootModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SquareRootModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SquareRootModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SubtractModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SubtractModifierType.cs
index 79cee880b..0dcda285a 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SubtractModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SubtractModifierType.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SubtractModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SumModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SumModifierType.cs
index eac8f9a15..3c2a816a6 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SumModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/SumModifierType.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SumModifierType : DataBindingModifierType<double, double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosecantModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosecantModifierType.cs
index af974d203..201bb6f8b 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosecantModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosecantModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class CosecantModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosineModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosineModifierType.cs
index b0fbf2932..3b4090654 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosineModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CosineModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class CosineModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CotangentModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CotangentModifierType.cs
index 76bd0adc6..dc95afffe 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CotangentModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/CotangentModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class CotangentModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SecantModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SecantModifierType.cs
index f55f2982b..f597ad762 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SecantModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SecantModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SecantModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SineModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SineModifierType.cs
index ba502c6d0..5a315b316 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SineModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/SineModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class SineModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/TangentModifierType.cs b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/TangentModifierType.cs
index 14c23d7ce..7a2b7c4ea 100644
--- a/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/TangentModifierType.cs
+++ b/src/Artemis.Core/DefaultTypes/DataBindings/Modifiers/Numbers/Trigonometry/TangentModifierType.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     internal class TangentModifierType : DataBindingModifierType<double>
     {
diff --git a/src/Artemis.Core/DefaultTypes/Properties/BoolLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/BoolLayerProperty.cs
index c88ff368f..0390977f1 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/BoolLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/BoolLayerProperty.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class BoolLayerProperty : LayerProperty<bool>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs
index 92e9a22f8..e76348410 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/ColorGradientLayerProperty.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class ColorGradientLayerProperty : LayerProperty<ColorGradient>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/EnumLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/EnumLayerProperty.cs
index 9068441f3..eb99a3b3e 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/EnumLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/EnumLayerProperty.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class EnumLayerProperty<T> : LayerProperty<T> where T : Enum
diff --git a/src/Artemis.Core/DefaultTypes/Properties/FloatLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/FloatLayerProperty.cs
index 4ac6959c0..b9fc3cfd7 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/FloatLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/FloatLayerProperty.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class FloatLayerProperty : LayerProperty<float>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/FloatRangeLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/FloatRangeLayerProperty.cs
index 64ff24c0a..1cb7c321a 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/FloatRangeLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/FloatRangeLayerProperty.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class FloatRangeLayerProperty : LayerProperty<FloatRange>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/IntLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/IntLayerProperty.cs
index 454f8328c..3ab64c02c 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/IntLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/IntLayerProperty.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class IntLayerProperty : LayerProperty<int>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/IntRangeLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/IntRangeLayerProperty.cs
index 4aa74cbd0..dc9503520 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/IntRangeLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/IntRangeLayerProperty.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class IntRangeLayerProperty : LayerProperty<IntRange>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/LayerBrushReferenceLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/LayerBrushReferenceLayerProperty.cs
index 2403b2f35..04eb19730 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/LayerBrushReferenceLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/LayerBrushReferenceLayerProperty.cs
@@ -1,4 +1,4 @@
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <summary>
     ///     A special layer property used to configure the selected layer brush
diff --git a/src/Artemis.Core/DefaultTypes/Properties/SKColorLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/SKColorLayerProperty.cs
index 201086356..a7663a789 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/SKColorLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/SKColorLayerProperty.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class SKColorLayerProperty : LayerProperty<SKColor>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/SKPointLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/SKPointLayerProperty.cs
index 312e20749..03c35baf2 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/SKPointLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/SKPointLayerProperty.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class SKPointLayerProperty : LayerProperty<SKPoint>
diff --git a/src/Artemis.Core/DefaultTypes/Properties/SKSizeLayerProperty.cs b/src/Artemis.Core/DefaultTypes/Properties/SKSizeLayerProperty.cs
index ef2097c01..9a3707f3a 100644
--- a/src/Artemis.Core/DefaultTypes/Properties/SKSizeLayerProperty.cs
+++ b/src/Artemis.Core/DefaultTypes/Properties/SKSizeLayerProperty.cs
@@ -1,6 +1,6 @@
 using SkiaSharp;
 
-namespace Artemis.Core.DefaultTypes
+namespace Artemis.Core
 {
     /// <inheritdoc />
     public class SKSizeLayerProperty : LayerProperty<SKSize>
diff --git a/src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs b/src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs
index 4345c4be7..6f55911d7 100644
--- a/src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs
+++ b/src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs
@@ -1,5 +1,4 @@
-using Artemis.Core.DefaultTypes;
-using SkiaSharp;
+using SkiaSharp;
 
 namespace Artemis.Core
 {
diff --git a/src/Artemis.Core/Models/Profile/LayerTransformProperties.cs b/src/Artemis.Core/Models/Profile/LayerTransformProperties.cs
index a0d858156..7c9d8c2ff 100644
--- a/src/Artemis.Core/Models/Profile/LayerTransformProperties.cs
+++ b/src/Artemis.Core/Models/Profile/LayerTransformProperties.cs
@@ -1,5 +1,4 @@
-using Artemis.Core.DefaultTypes;
-using SkiaSharp;
+using SkiaSharp;
 
 namespace Artemis.Core
 {
diff --git a/src/Artemis.Core/Services/Registration/ConditionOperatorService.cs b/src/Artemis.Core/Services/Registration/ConditionOperatorService.cs
index 122b43813..bc3664a4a 100644
--- a/src/Artemis.Core/Services/Registration/ConditionOperatorService.cs
+++ b/src/Artemis.Core/Services/Registration/ConditionOperatorService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Core.DefaultTypes;
 
 namespace Artemis.Core.Services
 {
diff --git a/src/Artemis.Core/Services/Registration/DataBindingService.cs b/src/Artemis.Core/Services/Registration/DataBindingService.cs
index 08afb30c3..b800a528c 100644
--- a/src/Artemis.Core/Services/Registration/DataBindingService.cs
+++ b/src/Artemis.Core/Services/Registration/DataBindingService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Core.DefaultTypes;
 
 namespace Artemis.Core.Services
 {