diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 2142d0508..7d5a3bd20 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -184,7 +184,6 @@
     <Compile Remove="obj\x64\Release\Screens\Settings\SettingsView.g.cs" />
     <Compile Remove="obj\x64\Release\Screens\Splash\SplashView.g.cs" />
     <Compile Remove="obj\x64\Release\Screens\Workshop\WorkshopView.g.cs" />
-    <Compile Remove="Screens\Module\ProfileEditor\LayerProperties\Timeline\PropertyRailItemView.xaml.cs" />
     <Compile Remove="obj\x64\Debug\Screens\Module\ProfileEditor\ProfileEditorView.g.cs" />
     <Compile Remove="obj\x64\Debug\Screens\Module\ProfileEditor\ProfileEditorView.g.i.cs" />
     <Compile Remove="obj\x64\Debug\Screens\Settings\Debug\DebugView.g.cs" />
diff --git a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs
index d29816eae..bdb8a2fc3 100644
--- a/src/Artemis.UI/Ninject/Factories/IVMFactory.cs
+++ b/src/Artemis.UI/Ninject/Factories/IVMFactory.cs
@@ -5,17 +5,17 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.Abstract;
 using Artemis.UI.Screens.Module;
-using Artemis.UI.Screens.Module.ProfileEditor;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
-using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem;
-using Artemis.UI.Screens.Module.ProfileEditor.Visualization;
-using Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools;
+using Artemis.UI.Screens.ProfileEditor;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree;
+using Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem;
+using Artemis.UI.Screens.ProfileEditor.Visualization;
+using Artemis.UI.Screens.ProfileEditor.Visualization.Tools;
 using Artemis.UI.Screens.Settings.Debug;
 using Artemis.UI.Screens.Settings.Tabs.Devices;
 using Artemis.UI.Screens.Settings.Tabs.Plugins;
diff --git a/src/Artemis.UI/Ninject/UiModule.cs b/src/Artemis.UI/Ninject/UiModule.cs
index 01de5c687..d780614d3 100644
--- a/src/Artemis.UI/Ninject/UiModule.cs
+++ b/src/Artemis.UI/Ninject/UiModule.cs
@@ -1,7 +1,8 @@
 using System;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens;
-using Artemis.UI.Screens.Module.ProfileEditor;
+using Artemis.UI.Screens.ProfileEditor;
+using Artemis.UI.Screens.ProfileEditor;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.Dialog;
 using Artemis.UI.Stylet;
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs
deleted file mode 100644
index de529c138..000000000
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyRailItemView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
-{
-    /// <summary>
-    /// Interaction logic for PropertyRailItemView.xaml
-    /// </summary>
-    public partial class PropertyTrackView : UserControl
-    {
-        public PropertyTrackView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml
index 5ae3034fe..84291c076 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Dialogs.ProfileCreateView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileCreateView"
              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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
index 2e7a38801..a28d9b4b1 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileCreateViewModel.cs
@@ -3,7 +3,7 @@ using Artemis.UI.Shared.Services.Dialog;
 using FluentValidation;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs
+namespace Artemis.UI.Screens.ProfileEditor.Dialogs
 {
     public class ProfileCreateViewModel : DialogViewModelBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportView.xaml
similarity index 91%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportView.xaml
index b468e76e8..793163e19 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Dialogs.ProfileExportView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileExportView"
              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.UI.Screens.Module.ProfileEditor.Dialogs"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Dialogs"
              xmlns:s="https://github.com/canton7/Stylet"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs
index cb3766e04..133166c24 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileExportViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileExportViewModel.cs
@@ -4,7 +4,7 @@ using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Shared.Services.Dialog;
 using MaterialDesignThemes.Wpf;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs
+namespace Artemis.UI.Screens.ProfileEditor.Dialogs
 {
     public class ProfileExportViewModel : DialogViewModelBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml
similarity index 93%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml
index cbf70009b..e2bce8be1 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Dialogs.ProfileImportView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.ProfileImportView"
              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.UI.Screens.Module.ProfileEditor.Dialogs"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Dialogs"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
              mc:Ignorable="d" 
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs
similarity index 89%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs
index 75a7d554c..8217c22ba 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileImportViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/ProfileImportViewModel.cs
@@ -1,12 +1,10 @@
-using System.Windows;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Shared.Services.Dialog;
 using ICSharpCode.AvalonEdit.Document;
 using MaterialDesignThemes.Wpf;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs
+namespace Artemis.UI.Screens.ProfileEditor.Dialogs
 {
     public class ProfileImportViewModel : DialogViewModelBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml
similarity index 96%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml
index a80c54313..2ff0328e1 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Dialogs.RenameView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Dialogs.RenameView"
              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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml.cs
similarity index 90%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml.cs
index e2f2872dd..1d5130ada 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameView.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs
+namespace Artemis.UI.Screens.ProfileEditor.Dialogs
 {
     /// <summary>
     ///     Interaction logic for RenameView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs
index c20b94793..cea634860 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/RenameViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Dialogs/RenameViewModel.cs
@@ -3,7 +3,7 @@ using Artemis.UI.Shared.Services.Dialog;
 using FluentValidation;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Dialogs
+namespace Artemis.UI.Screens.ProfileEditor.Dialogs
 {
     public class RenameViewModel : DialogViewModelBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs
similarity index 92%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs
index 1c261413b..69728ff3a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using Artemis.Core.Models.Profile.Conditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract
 {
     public abstract class DisplayConditionViewModel : PropertyChangedBase, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
index 21180d338..cd31bb539 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionGroupView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionGroupView"
              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.UI.Screens.Module.ProfileEditor.DisplayConditions"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              mc:Ignorable="d"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
index 8e3d15757..c5bd75612 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
@@ -4,12 +4,12 @@ using System.Threading.Tasks;
 using System.Windows;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Humanizer;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     public class DisplayConditionGroupViewModel : DisplayConditionViewModel, IViewAware
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml
index 8652aa903..58ccf5c2c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionListView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionListView"
              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.UI.Screens.Module.ProfileEditor.DisplayConditions"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
              xmlns:s="https://github.com/canton7/Stylet"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs
similarity index 91%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs
index 0659f4681..897403a3a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListView.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     /// <summary>
     ///     Interaction logic for DisplayConditionListView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
index 1c26b8682..82ffe8c0a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionListViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Timers;
@@ -8,14 +7,14 @@ using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
 using Humanizer;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     public class DisplayConditionListViewModel : DisplayConditionViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
index 490182a86..84d39c7d7 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
@@ -3,15 +3,16 @@
     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.UI.Screens.Module.ProfileEditor.DisplayConditions"
+    xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:converters="clr-namespace:Artemis.UI.Converters"
     xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
-    x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionPredicateView"
+    xmlns:displayConditions="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
+    x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionPredicateView"
     mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800"
-    d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type local:DisplayConditionPredicateViewModel}}">
+    d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type displayConditions:DisplayConditionPredicateViewModel}}">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs
similarity index 91%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs
index 9b52d41af..bfef45278 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     /// <summary>
     ///     Interaction logic for DisplayConditionPredicateView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
index 8b4d64039..9914593b1 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs
@@ -10,7 +10,7 @@ using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
 using Artemis.UI.Shared.Services;
@@ -18,7 +18,7 @@ using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     public class DisplayConditionPredicateViewModel : DisplayConditionViewModel, IHandle<MainWindowKeyEvent>, IHandle<MainWindowMouseEvent>
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml
similarity index 96%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml
index b8b30d465..73148588c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml
@@ -3,14 +3,15 @@
     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.UI.Screens.Module.ProfileEditor.DisplayConditions"
+    xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:converters="clr-namespace:Artemis.UI.Converters"
-    x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionsView"
+    xmlns:displayConditions="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
+    x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionsView"
     mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800"
-    d:DataContext="{d:DesignInstance {x:Type local:DisplayConditionsViewModel}}">
+    d:DataContext="{d:DesignInstance {x:Type displayConditions:DisplayConditionsViewModel}}">
     <UserControl.Resources>
         <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
     </UserControl.Resources>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
index b1195b782..85b84bafa 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
@@ -5,7 +5,7 @@ using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
+namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
     public class DisplayConditionsViewModel : ProfileEditorPanelViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml
similarity index 93%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml
index f98ae0fb6..6acacbc9a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowView.xaml
@@ -1,9 +1,9 @@
-<controls:MaterialWindow x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerBrushSettingsWindowView"
+<controls:MaterialWindow x:Class="Artemis.UI.Screens.ProfileEditor.LayerBrushSettingsWindowView"
                          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.Module.ProfileEditor"
+                         xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor"
                          xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                          xmlns:s="https://github.com/canton7/Stylet"
                          xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
similarity index 80%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
index 91f355feb..fc8496235 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerBrushSettingsWindowViewModel.cs
@@ -1,8 +1,7 @@
 using Artemis.Core.Plugins.Abstract.ViewModels;
-using MaterialDesignThemes.Wpf;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor
+namespace Artemis.UI.Screens.ProfileEditor
 {
     public class LayerBrushSettingsWindowViewModel : Conductor<BrushConfigurationViewModel>
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml
similarity index 93%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml
index 64ebfe774..f7f6d2977 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowView.xaml
@@ -1,9 +1,9 @@
-<controls:MaterialWindow x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerEffectSettingsWindowView"
+<controls:MaterialWindow x:Class="Artemis.UI.Screens.ProfileEditor.LayerEffectSettingsWindowView"
                          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.Module.ProfileEditor"
+                         xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor"
                          xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
                          xmlns:s="https://github.com/canton7/Stylet"
                          xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
similarity index 87%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
index ed0283dbb..1e45118a8 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerEffectSettingsWindowViewModel.cs
@@ -1,7 +1,7 @@
 using Artemis.Core.Plugins.Abstract.ViewModels;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor
+namespace Artemis.UI.Screens.ProfileEditor
 {
     public class LayerEffectSettingsWindowViewModel : Conductor<EffectConfigurationViewModel>
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs
similarity index 92%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs
index 6cfb11aed..661234793 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Abstract/LayerPropertyBaseViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract
 {
     public abstract class LayerPropertyBaseViewModel : PropertyChangedBase, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
index 446ac79ac..92b684251 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects.EffectsView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects.EffectsView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects"
+             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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
index cd6c58420..9144bf534 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs
@@ -8,7 +8,7 @@ using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects
 {
     public class EffectsViewModel : PropertyChangedBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
index d17d952d9..cf14023ad 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
@@ -3,18 +3,20 @@
     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.UI.Screens.Module.ProfileEditor.LayerProperties"
+    xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
     xmlns:s="https://github.com/canton7/Stylet"
-    xmlns:timeline="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+    xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
     xmlns:Converters="clr-namespace:Artemis.UI.Converters"
     xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
-    x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerPropertiesView"
+    xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
+    xmlns:controls="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.Controls"
+    x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerPropertiesView"
     mc:Ignorable="d"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    d:DataContext="{d:DesignInstance {x:Type local:LayerPropertiesViewModel}}"
+    d:DataContext="{d:DesignInstance {x:Type layerProperties:LayerPropertiesViewModel}}"
     behaviors:InputBindingBehavior.PropagateInputBindingsToWindow="True">
     <UserControl.Resources>
         <Converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
@@ -199,7 +201,7 @@
 
 
                     <!-- Timeline header body -->
-                    <timeline:PropertyTimelineHeader Margin="0 25 0 0"
+                    <controls:PropertyTimelineHeader Margin="0 25 0 0"
                                                      Fill="{DynamicResource MaterialDesignBody}"
                                                      PixelsPerSecond="{Binding ProfileEditorService.PixelsPerSecond}"
                                                      HorizontalOffset="{Binding ContentHorizontalOffset, ElementName=TimelineHeaderScrollViewer}"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs
index 499528790..9d23519d7 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
     /// <summary>
     ///     Interaction logic for LayerPropertiesView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
index 0a846301d..2ff954934 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
@@ -12,16 +12,16 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerEffects;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.Services.Interfaces;
 using GongSolutions.Wpf.DragDrop;
 using Stylet;
-using static Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.LayerPropertyGroupViewModel.ViewModelType;
+using static Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerPropertyGroupViewModel.ViewModelType;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
     public class LayerPropertiesViewModel : ProfileEditorPanelViewModel, IDropTarget
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs
index 506fb3b80..3ede71c73 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs
@@ -5,15 +5,15 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree;
 using Artemis.UI.Shared.Services.Interfaces;
 using Humanizer;
 using Ninject;
 using Ninject.Parameters;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
     public class LayerPropertyGroupViewModel : LayerPropertyBaseViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs
index bb6aaf9c3..b23e124bd 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs
@@ -4,16 +4,16 @@ using System.Linq;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.UI.Exceptions;
 using Artemis.UI.PropertyInput;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree;
 using Artemis.UI.Shared.PropertyInput;
 using Artemis.UI.Shared.Services.Interfaces;
 using Humanizer;
 using Ninject;
 using Ninject.Parameters;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
     public class LayerPropertyViewModel<T> : LayerPropertyViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs
index 3b96466a7..5eb3cbf83 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/Controls/PropertyTimelineHeader.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.Controls
 {
     public class PropertyTimelineHeader : FrameworkElement
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs
index 1e787c13f..dd064de87 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineEasingViewModel.cs
@@ -3,7 +3,7 @@ using System.Windows.Media;
 using Artemis.Core.Utilities;
 using Humanizer;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelineEasingViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs
index a9549b4f2..3005b209c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs
@@ -6,7 +6,7 @@ using Artemis.Core.Utilities;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelineKeyframeViewModel<T> : TimelineKeyframeViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml
similarity index 87%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml
index 7fa179733..233f864b0 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupView.xaml
@@ -1,12 +1,13 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.TimelinePropertyGroupView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.TimelinePropertyGroupView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties"
+             xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:layerProperties1="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:TimelinePropertyGroupViewModel}"
@@ -60,10 +61,10 @@
                 </Style >
             </ItemsControl.ItemContainerStyle>
             <ItemsControl.Resources>
-                <DataTemplate DataType="{x:Type layerProperties:LayerPropertyGroupViewModel}">
+                <DataTemplate DataType="{x:Type layerProperties1:LayerPropertyGroupViewModel}">
                     <ContentControl s:View.Model="{Binding TimelinePropertyGroupViewModel}" IsTabStop="False" HorizontalAlignment="Stretch"/>
                 </DataTemplate>
-                <DataTemplate DataType="{x:Type layerProperties:LayerPropertyViewModel}">
+                <DataTemplate DataType="{x:Type layerProperties1:LayerPropertyViewModel}">
                     <ContentControl s:View.Model="{Binding TimelinePropertyBaseViewModel}" IsTabStop="False" HorizontalAlignment="Stretch" />
                 </DataTemplate>
             </ItemsControl.Resources>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs
index 881e40045..3cde9cd48 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyGroupViewModel.cs
@@ -1,11 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelinePropertyGroupViewModel : PropertyChangedBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml
index d20695b20..93b1a3a3d 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyView.xaml
@@ -1,11 +1,12 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.TimelinePropertyView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.TimelinePropertyView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance local:TimelinePropertyViewModel}"
@@ -35,7 +36,7 @@
                              Height="10"
                              Margin="-5,6,0,0"
                              ToolTip="{Binding Timestamp}"
-                             s:View.ActionTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:TimelineView}}, Path=DataContext}"
+                             s:View.ActionTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type timeline:TimelineView}}, Path=DataContext}"
                              MouseDown="{s:Action KeyframeMouseDown}"
                              MouseUp="{s:Action KeyframeMouseUp}"
                              MouseMove="{s:Action KeyframeMouseMove}"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs
index a5e423c2e..6f5c25c7b 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelinePropertyViewModel<T> : TimelinePropertyViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml
index 56d957874..f8d1d8922 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentView.xaml
@@ -1,15 +1,16 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.TimelineSegmentView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.TimelineSegmentView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
+             xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type local:TimelineSegmentViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type timeline:TimelineSegmentViewModel}}">
     <UserControl.Resources>
         <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
     </UserControl.Resources>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs
index 85f49afe0..36c41ddbd 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs
@@ -4,13 +4,12 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 using Artemis.Core.Models.Profile;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Utilities;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelineSegmentViewModel : PropertyChangedBase, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml
index ecc2c3c42..a5fcb3adb 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline.TimelineView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.TimelineView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
              xmlns:s="https://github.com/canton7/Stylet"
              mc:Ignorable="d"
              d:DesignHeight="25"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs
index 8fcf57eaf..ff126a29c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs
@@ -8,12 +8,12 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
 using Artemis.Core.Models.Profile;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Utilities;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
     public class TimelineViewModel : PropertyChangedBase, IViewAware, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml
index 6bd0b2e1f..83a3f8868 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.TreePropertyGroupView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree.TreePropertyGroupView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Tree"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
index aba93fb73..6d49a1d47 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyGroupViewModel.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Artemis.Core.Services.Interfaces;
-using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.Dialogs;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 {
     public class TreePropertyGroupViewModel : PropertyChangedBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
similarity index 87%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
index db7d1b499..d54b18d18 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
@@ -1,14 +1,15 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.TreePropertyView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree.TreePropertyView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Tree"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:tree="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type local:TreePropertyViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type tree:TreePropertyViewModel}}">
     <Grid Height="22" Margin="-20 0 0 0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
index c0470e579..007d08e7a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Utilities;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Shared.PropertyInput;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 {
 
     public class TreePropertyViewModel<T> : TreePropertyViewModel
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml
similarity index 89%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml
index f96b3d4a2..74bcfa955 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeView.xaml
@@ -1,17 +1,19 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree.TreeView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree.TreeView"
              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.UI.Screens.Module.ProfileEditor.LayerProperties.Tree"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:abstract="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract"
-             xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.LayerProperties"
+             xmlns:abstract="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract"
+             xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
              xmlns:dd="urn:gong-wpf-dragdrop"
+             xmlns:tree="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree"
+             xmlns:layerProperties1="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type local:TreeViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type tree:TreeViewModel}}">
     <UserControl.Resources>
         <Style x:Key="PropertyTreeStyle" TargetType="{x:Type TreeViewItem}">
             <Setter Property="Background" Value="Transparent" />
@@ -99,10 +101,10 @@
             </Style>
         </TreeView.ItemContainerStyle>
         <TreeView.Resources>
-            <HierarchicalDataTemplate DataType="{x:Type layerProperties:LayerPropertyGroupViewModel}" ItemsSource="{Binding Children}">
+            <HierarchicalDataTemplate DataType="{x:Type layerProperties1:LayerPropertyGroupViewModel}" ItemsSource="{Binding Children}">
                 <ContentControl s:View.Model="{Binding TreePropertyGroupViewModel}" />
             </HierarchicalDataTemplate>
-            <DataTemplate DataType="{x:Type layerProperties:LayerPropertyViewModel}">
+            <DataTemplate DataType="{x:Type layerProperties1:LayerPropertyViewModel}">
                 <ContentControl s:View.Model="{Binding TreePropertyBaseViewModel}" dd:DragDrop.DragSourceIgnore="True" />
             </DataTemplate>
         </TreeView.Resources>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
index e5b7cc3d2..bb0f128f3 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
+namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 {
     public class TreeViewModel : PropertyChangedBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs
similarity index 63%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs
index 4d58d279f..e2829cefe 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorPanelViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorPanelViewModel.cs
@@ -1,6 +1,6 @@
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor
+namespace Artemis.UI.Screens.ProfileEditor
 {
     public class ProfileEditorPanelViewModel : Screen
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
index 13371f599..28d99b194 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.ProfileEditorView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.ProfileEditorView"
              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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor"
+             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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
index ac1e1c11f..42e8cfad0 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
@@ -8,16 +8,16 @@ using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Storage.Interfaces;
-using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
-using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions;
-using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties;
-using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree;
-using Artemis.UI.Screens.Module.ProfileEditor.Visualization;
+using Artemis.UI.Screens.ProfileEditor.Dialogs;
+using Artemis.UI.Screens.ProfileEditor.DisplayConditions;
+using Artemis.UI.Screens.ProfileEditor.LayerProperties;
+using Artemis.UI.Screens.ProfileEditor.ProfileTree;
+using Artemis.UI.Screens.ProfileEditor.Visualization;
 using Artemis.UI.Shared.Services.Interfaces;
 using MaterialDesignThemes.Wpf;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor
+namespace Artemis.UI.Screens.ProfileEditor
 {
     public class ProfileEditorViewModel : Conductor<ProfileEditorPanelViewModel>.Collection.AllActive
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml
similarity index 86%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml
index 761447d45..2107c3b2f 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.ProfileTreeView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.ProfileTreeView"
              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"
@@ -6,13 +6,15 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:dd="urn:gong-wpf-dragdrop"
-             xmlns:profileTree="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree"
-             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem"
+             xmlns:profileTree="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree"
+             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
              xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree"
+             xmlns:treeItem1="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type profileTree:ProfileTreeViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type profileTree1:ProfileTreeViewModel}}">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -36,11 +38,11 @@
                 <behaviors:TreeViewSelectionBehavior ExpandSelected="True" SelectedItem="{Binding SelectedTreeItem}" />
             </b:Interaction.Behaviors>
             <TreeView.Resources>
-                <HierarchicalDataTemplate DataType="{x:Type treeItem:FolderViewModel}" ItemsSource="{Binding Children}">
+                <HierarchicalDataTemplate DataType="{x:Type treeItem1:FolderViewModel}" ItemsSource="{Binding Children}">
                     <ContentControl s:View.Model="{Binding}" />
                 </HierarchicalDataTemplate>
                 <!-- TODO: Ensure this item source is required -->
-                <HierarchicalDataTemplate DataType="{x:Type treeItem:LayerViewModel}" ItemsSource="{Binding Children}">
+                <HierarchicalDataTemplate DataType="{x:Type treeItem1:LayerViewModel}" ItemsSource="{Binding Children}">
                     <ContentControl s:View.Model="{Binding}" />
                 </HierarchicalDataTemplate>
             </TreeView.Resources>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs
index 4009ab0f7..24f8d0870 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/ProfileTreeViewModel.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using Artemis.Core.Models.Profile;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem;
+using Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.Services.Interfaces;
 using GongSolutions.Wpf.DragDrop;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree
+namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
 {
     public class ProfileTreeViewModel : ProfileEditorPanelViewModel, IDropTarget
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml
similarity index 90%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml
index 35ecdc2ef..644d79918 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderView.xaml
@@ -1,14 +1,15 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem.FolderView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem.FolderView"
              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:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem"
+             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
+             xmlns:treeItem1="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type treeItem:FolderViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type treeItem1:FolderViewModel}}">
     <!-- Capture clicks on full tree view item -->
     <StackPanel Margin="-10" Background="Transparent">
         <StackPanel.ContextMenu>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
index 06f613eb8..94571d760 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/FolderViewModel.cs
@@ -3,7 +3,7 @@ using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
+namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 {
     public class FolderViewModel : TreeItemViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
similarity index 89%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
index 1cb6d3db4..339ab0a7c 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerView.xaml
@@ -1,14 +1,15 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem.LayerView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem.LayerView"
              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:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem"
+             xmlns:treeItem="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
+             xmlns:treeItem1="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type treeItem:LayerViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type treeItem1:LayerViewModel}}">
     <!-- Capture clicks on full tree view item -->
     <StackPanel Margin="-10" Background="Transparent">
         <StackPanel.ContextMenu>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
similarity index 92%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
index 31ea44012..c2b8e9e6a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs
@@ -3,7 +3,7 @@ using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
+namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 {
     public class LayerViewModel : TreeItemViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
index 04d32a845..094676aac 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/TreeItemViewModel.cs
@@ -6,11 +6,11 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.Dialogs;
+using Artemis.UI.Screens.ProfileEditor.Dialogs;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.ProfileTree.TreeItem
+namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 {
     public abstract class TreeItemViewModel : PropertyChangedBase, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs
similarity index 91%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs
index 2095e0fc0..ae843deaf 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/CanvasViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/CanvasViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
     public abstract class CanvasViewModel : PropertyChangedBase, IDisposable
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml
similarity index 92%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml
index 998917d05..c05915fac 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceView.xaml
@@ -1,16 +1,17 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.ProfileDeviceView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.ProfileDeviceView"
              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:s="https://github.com/canton7/Stylet"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:visualization="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization"
+             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:visualization1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              mc:Ignorable="d"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type visualization:ProfileDeviceViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type visualization1:ProfileDeviceViewModel}}">
     <UserControl.Resources>
         <converters:NullToImageConverter x:Key="NullToImageConverter" />
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs
index 4706628a9..332663a13 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileDeviceViewModel.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using Artemis.Core.Models.Surface;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
     public class ProfileDeviceViewModel : CanvasViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml
similarity index 89%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml
index bd729bd1c..37c85752d 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerView.xaml
@@ -1,14 +1,15 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.ProfileLayerView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.ProfileLayerView"
              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.UI.Screens.Module.ProfileEditor.Visualization"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              mc:Ignorable="d"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type local:ProfileLayerViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type visualization:ProfileLayerViewModel}}">
     <UserControl.Resources>
         <Style TargetType="{x:Type Path}" x:Key="SelectedShapeStyle">
             <Style.Triggers>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerViewModel.cs
index 4aa14f849..cb8887bed 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLayerViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerViewModel.cs
@@ -11,7 +11,7 @@ using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
     public class ProfileLayerViewModel : CanvasViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedView.xaml
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedView.xaml
index 92311bd8c..116799494 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedView.xaml
@@ -1,12 +1,13 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.ProfileLedView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.ProfileLedView"
              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:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:visualization="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization"
+             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
+             xmlns:visualization1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              mc:Ignorable="d"
-             d:DataContext="{d:DesignInstance {x:Type visualization:ProfileLedViewModel}}"
+             d:DataContext="{d:DesignInstance {x:Type visualization1:ProfileLedViewModel}}"
              d:DesignHeight="25" d:DesignWidth="25">
     <UserControl.Resources>
         <converters:NullToImageConverter x:Key="NullToImageConverter" />
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedViewModel.cs
index c3b1cf972..f6e327b16 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLedViewModel.cs
@@ -7,7 +7,7 @@ using RGB.NET.Core;
 using Stylet;
 using Color = System.Windows.Media.Color;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
     public class ProfileLedViewModel : PropertyChangedBase
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
index 8775be1e3..d92ada6a2 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
@@ -1,16 +1,17 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.ProfileView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.ProfileView"
              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:s="https://github.com/canton7/Stylet"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization"
+             xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              xmlns:utilities="clr-namespace:Artemis.UI.Shared.Utilities;assembly=Artemis.UI.Shared"
              xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
+             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
              mc:Ignorable="d"
              d:DesignHeight="510.9" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type profileEditor:ProfileViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type visualization:ProfileViewModel}}">
     <UserControl.Resources>
         <Style TargetType="Grid" x:Key="InitializingFade">
             <Style.Triggers>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs
index e2d7f4bd9..a65eb6163 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs
@@ -12,12 +12,12 @@ using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools;
+using Artemis.UI.Screens.ProfileEditor.Visualization.Tools;
 using Artemis.UI.Screens.Shared;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
+namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
     public class ProfileViewModel : ProfileEditorPanelViewModel, IHandle<MainWindowFocusChangedEvent>, IHandle<MainWindowKeyEvent>
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolView.xaml
similarity index 72%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolView.xaml
index f1b5563d0..892d021b6 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolView.xaml
@@ -1,17 +1,19 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.EditToolView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.Tools.EditToolView"
              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.UI.Screens.Module.ProfileEditor.Visualization.Tools"
-             xmlns:userControls="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.Visualization.UserControls"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.Tools"
+             xmlns:userControls="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.UserControls"
              xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:tools="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.Tools"
+             xmlns:userControls1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.UserControls"
              mc:Ignorable="d"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance {x:Type local:EditToolViewModel}}">
+             d:DataContext="{d:DesignInstance {x:Type tools:EditToolViewModel}}">
     <Canvas UseLayoutRounding="False">
-        <userControls:LayerShapeControl Zoom="{Binding ProfileViewModel.PanZoomViewModel.Zoom}"
+        <userControls1:LayerShapeControl Zoom="{Binding ProfileViewModel.PanZoomViewModel.Zoom}"
                                         ShapePath="{Binding ShapePath}"
                                         ShapeAnchor="{Binding ShapeAnchor}"
                                         ShapeGeometry="{Binding ShapeGeometry}"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
index 135bf9392..bcad940ac 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
@@ -10,7 +10,7 @@ using SkiaSharp;
 using SkiaSharp.Views.WPF;
 using Stylet;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     public class EditToolViewModel : VisualizationToolViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml
index a702d0bd9..2e3b208f5 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.SelectionRemoveToolView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.Tools.SelectionRemoveToolView"
              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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs
similarity index 81%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs
index a0e31d51f..b476679ac 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolView.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     /// <summary>
     ///     Interaction logic for SelectionRemoveToolView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs
index e7f4050b5..6805fbb6d 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionRemoveToolViewModel.cs
@@ -6,7 +6,7 @@ using Artemis.Core.Models.Profile;
 using Artemis.UI.Properties;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     public class SelectionRemoveToolViewModel : VisualizationToolViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml
similarity index 95%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml
index 93985248e..bd09915ba 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.SelectionToolView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.Tools.SelectionToolView"
              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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs
similarity index 80%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs
index 8a01c2af7..55b7ad021 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolView.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     /// <summary>
     ///     Interaction logic for SelectionToolView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs
index 372fe0102..6c1476eee 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/SelectionToolViewModel.cs
@@ -7,7 +7,7 @@ using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Properties;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     public class SelectionToolViewModel : VisualizationToolViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml
similarity index 66%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml
index 9f29a3e8b..9815cfb58 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools.ViewpointMoveToolView"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.Tools.ViewpointMoveToolView"
              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.UI.Screens.Module.ProfileEditor.Visualization.Tools"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.Tools"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid />
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs
similarity index 81%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs
index 114288260..f90dbe779 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolView.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     /// <summary>
     ///     Interaction logic for ViewpointMoveToolView.xaml
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs
similarity index 90%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs
index ccd4f140b..245451fa6 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/ViewpointMoveToolViewModel.cs
@@ -1,7 +1,7 @@
 using System.Windows.Input;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     public class ViewpointMoveToolViewModel : VisualizationToolViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs
index c64ee4220..ac0b14eaa 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/VisualizationToolViewModel.cs
@@ -3,7 +3,7 @@ using System.Windows;
 using System.Windows.Input;
 using Artemis.UI.Shared.Services.Interfaces;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
     public abstract class VisualizationToolViewModel : CanvasViewModel
     {
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml
similarity index 98%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml
index 0d077b503..15286439e 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Module.ProfileEditor.Visualization.UserControls.LayerShapeControl"
+<UserControl x:Class="Artemis.UI.Screens.ProfileEditor.Visualization.UserControls.LayerShapeControl"
              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"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs
rename to src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs
index f26958179..a5db20664 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/UserControls/LayerShapeControl.xaml.cs
@@ -6,7 +6,7 @@ using System.Windows.Media;
 using Artemis.UI.Events;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.UserControls
+namespace Artemis.UI.Screens.ProfileEditor.Visualization.UserControls
 {
     /// <summary>
     ///     Interaction logic for LayerShapeControl.xaml