diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 049023504..54d1eeb34 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -44,53 +44,53 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Screens\Profile\" />
+      <Folder Include="Screens\Profiles\" />
     </ItemGroup>
 
     <ItemGroup>
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\AlwaysOnConditionView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\EventConditionView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\PlayOnceConditionView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\ConditionTypes\StaticConditionView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\DisplayCondition\DisplayConditionScriptView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\MenuBar\MenuBarView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Playback\PlaybackView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\ContentDialogs\ProfileElementRenameView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\CategoryAdaptionHintView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\DeviceAdaptionHintView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\KeyboardSectionAdaptionHintView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\SingleLedAdaptionHintView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\Dialogs\LayerHintsDialogView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\FolderTreeItemView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\LayerTreeItemView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\ProfileTree\ProfileTreeView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\DataBinding\DataBindingView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Dialogs\AddEffectView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Dialogs\TimelineSegmentEditView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\PropertiesView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineEasingView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineKeyframeView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\EndSegmentView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\MainSegmentView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\Segment.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\Segments\StartSegmentView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelineGroupView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelinePropertyView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Timeline\TimelineView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\ContentDialogs\LayerEffectRenameView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\Dialogs\LayerBrushPresetView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\TreeGroupView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Tree\TreePropertyView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Windows\BrushConfigurationWindowView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\Properties\Windows\EffectConfigurationWindowView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\StatusBar\StatusBarView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\SelectionAddToolView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\SelectionRemoveToolView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Tools\TransformToolView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\VisualEditorView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Visualizers\LayerShapeVisualizerView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\Panels\VisualEditor\Visualizers\LayerVisualizerView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\ProfileEditorTitleBarView.axaml" />
-      <AdditionalFiles Include="Screens\Profile\ProfileEditor\ProfileEditorView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\AlwaysOnConditionView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\EventConditionView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\PlayOnceConditionView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\ConditionTypes\StaticConditionView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\DisplayCondition\DisplayConditionScriptView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\MenuBar\MenuBarView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Playback\PlaybackView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\ContentDialogs\ProfileElementRenameView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\CategoryAdaptionHintView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\DeviceAdaptionHintView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\KeyboardSectionAdaptionHintView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\AdaptionHints\SingleLedAdaptionHintView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\Dialogs\LayerHintsDialogView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\FolderTreeItemView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\LayerTreeItemView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\ProfileTree\ProfileTreeView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\DataBinding\DataBindingView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Dialogs\AddEffectView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Dialogs\TimelineSegmentEditView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\PropertiesView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineEasingView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Keyframes\TimelineKeyframeView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\EndSegmentView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\MainSegmentView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\Segment.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\Segments\StartSegmentView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelineGroupView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelinePropertyView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Timeline\TimelineView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\ContentDialogs\LayerEffectRenameView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\Dialogs\LayerBrushPresetView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\TreeGroupView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Tree\TreePropertyView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Windows\BrushConfigurationWindowView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\Properties\Windows\EffectConfigurationWindowView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\StatusBar\StatusBarView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\SelectionAddToolView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\SelectionRemoveToolView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Tools\TransformToolView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\VisualEditorView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Visualizers\LayerShapeVisualizerView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\Panels\VisualEditor\Visualizers\LayerVisualizerView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\ProfileEditorTitleBarView.axaml" />
+      <AdditionalFiles Include="Screens\Profiles\ProfileEditor\ProfileEditorView.axaml" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs
index 8be626e0d..e452d9825 100644
--- a/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs
+++ b/src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
-using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 using Avalonia;
 using Avalonia.Data.Converters;
 
diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs
index 589ddaa95..9194bc0e6 100644
--- a/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs
+++ b/src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs
@@ -6,7 +6,7 @@ using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Artemis.UI.Shared.Services.ProfileEditor;
@@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using Artemis.UI.Shared.Services.PropertyInput;
 using Avalonia.Threading;
 using ReactiveUI;
-using LayerBrushPresetViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel;
+using LayerBrushPresetViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel;
 
 namespace Artemis.UI.DefaultTypes.PropertyInput;
 
diff --git a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
index 4ea40ce84..6f389768d 100644
--- a/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
+++ b/src/Artemis.UI/DryIoc/Factories/IVMFactory.cs
@@ -11,19 +11,12 @@ using Artemis.UI.Screens.Device.Leds;
 using Artemis.UI.Screens.Plugins;
 using Artemis.UI.Screens.Plugins.Features;
 using Artemis.UI.Screens.Plugins.Prerequisites;
-using Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
-using Artemis.UI.Screens.ProfileEditor;
-using Artemis.UI.Screens.ProfileEditor.ProfileTree;
-using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
-using Artemis.UI.Screens.ProfileEditor.Properties;
-using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
-using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers;
+using Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 using Artemis.UI.Screens.Settings;
 using Artemis.UI.Screens.Settings.Updating;
 using Artemis.UI.Screens.Sidebar;
@@ -33,14 +26,14 @@ using Artemis.UI.Screens.VisualScripting.Pins;
 using Artemis.WebClient.Updating;
 using DryIoc;
 using ReactiveUI;
-using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel;
-using LayerVisualizerViewModel = Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel;
-using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel;
-using PropertyGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyGroupViewModel;
-using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel;
-using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel;
-using TimelineGroupViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupViewModel;
-using TreeItemViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.TreeItemViewModel;
+using LayerShapeVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel;
+using LayerVisualizerViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel;
+using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel;
+using PropertyGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyGroupViewModel;
+using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel;
+using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel;
+using TimelineGroupViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupViewModel;
+using TreeItemViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.TreeItemViewModel;
 
 namespace Artemis.UI.DryIoc.Factories;
 
diff --git a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs
index ff4b761f1..c3c46d26c 100644
--- a/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs
+++ b/src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs
@@ -2,13 +2,13 @@
 using Artemis.Core;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Exceptions;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
-using Artemis.UI.Screens.ProfileEditor.Properties;
-using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 using DryIoc;
-using PropertyViewModel = Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertyViewModel;
+using PropertyViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertyViewModel;
 
 namespace Artemis.UI.DryIoc.InstanceProviders;
 
diff --git a/src/Artemis.UI/Routing/Routes.cs b/src/Artemis.UI/Routing/Routes.cs
index 05ba5b7fd..766375606 100644
--- a/src/Artemis.UI/Routing/Routes.cs
+++ b/src/Artemis.UI/Routing/Routes.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Artemis.UI.Screens.Home;
-using Artemis.UI.Screens.ProfileEditor;
+using Artemis.UI.Screens.Profiles.ProfileEditor;
 using Artemis.UI.Screens.Root;
 using Artemis.UI.Screens.Settings;
 using Artemis.UI.Screens.Settings.Updating;
@@ -16,7 +16,7 @@ using Artemis.UI.Screens.Workshop.Plugins;
 using Artemis.UI.Screens.Workshop.Profile;
 using Artemis.UI.Shared.Routing;
 using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel;
-using ProfileEditorViewModel = Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorViewModel;
+using ProfileEditorViewModel = Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorViewModel;
 
 namespace Artemis.UI.Routing
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
similarity index 85%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
index 8fb8c8444..15d8c14f7 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypeViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
 
 public class ConditionTypeViewModel : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
index 7609940ae..1901a83a8 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView">
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.AlwaysOnConditionView">
 
     <DockPanel VerticalAlignment="Top" Margin="0 5">
         <avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
similarity index 66%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
index 03367b6c9..94df86ed1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public partial class AlwaysOnConditionView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
index 4ae79f2c6..a4d0af4e1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/AlwaysOnConditionViewModel.cs
@@ -1,7 +1,7 @@
 using Artemis.Core;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public class AlwaysOnConditionViewModel : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
index 981594e4b..38c232a9d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker;assembly=Artemis.UI.Shared"
-             xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes"
+             xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.EventConditionView"
              x:DataType="conditionTypes:EventConditionViewModel">
     <DockPanel HorizontalAlignment="Stretch">
         <DockPanel.Styles>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
similarity index 69%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
index bd33d86d7..f33d0bb12 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public partial class EventConditionView : ReactiveUserControl<EventConditionViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
index 73dc2e6a2..586f00a7b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs
@@ -11,7 +11,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public class EventConditionViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
similarity index 86%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
index e3ea967ec..68861b4c9 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView">
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.PlayOnceConditionView">
     <DockPanel VerticalAlignment="Top" Margin="0 5">
         <avalonia:MaterialIcon Kind="InfoCircle" Margin="5 0" />
         <TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
similarity index 66%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
index 91999f9e6..0e66434ce 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public partial class PlayOnceConditionView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
index adb27fa3f..e45cd295b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/PlayOnceConditionViewModel.cs
@@ -1,7 +1,7 @@
 using Artemis.Core;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public class PlayOnceConditionViewModel : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
similarity index 92%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
index f8ff5cbab..fa7614f97 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes"
+             xmlns:conditionTypes="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes.StaticConditionView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes.StaticConditionView"
              x:DataType="conditionTypes:StaticConditionViewModel">
     <DockPanel HorizontalAlignment="Stretch">
         <DockPanel.Styles>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
similarity index 69%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
index 7c0fdf07b..0ac036acc 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public partial class StaticConditionView : ReactiveUserControl<StaticConditionViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
index 95134ddd5..9d70fa410 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs
@@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.ConditionTypes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.ConditionTypes;
 
 public class StaticConditionViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
index 1b2f50ad3..6453d45ac 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
@@ -2,9 +2,9 @@
              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:displayCondition="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition"
+             xmlns:displayCondition="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition"
              mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="650"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition.DisplayConditionScriptView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition.DisplayConditionScriptView"
              x:DataType="displayCondition:DisplayConditionScriptViewModel">
     <UserControl.Styles>
         <Style Selector="ComboBox.condition-type /template/ ContentPresenter#ContentPresenter">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
similarity index 75%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
index 641b25e8c..0ebff7437 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
 
 public partial class DisplayConditionScriptView : ReactiveUserControl<DisplayConditionScriptViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
index ec5b824c5..1612349a3 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs
@@ -9,7 +9,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
 
 public class DisplayConditionScriptViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
similarity index 99%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
index 0965c60e3..7653a35c8 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:profileEditor="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared"
-             xmlns:menuBar1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.MenuBar"
+             xmlns:menuBar1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.MenuBar.MenuBarView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar.MenuBarView"
              x:DataType="menuBar1:MenuBarViewModel">
     <Menu VerticalAlignment="Top" Closed="MenuBase_OnMenuClosed">
         <MenuItem Header="_File">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
similarity index 89%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
index 7970a812e..6e3c6112b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.MenuBar;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar;
 
 public partial class MenuBarView : ReactiveUserControl<MenuBarViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
index 8260aa3f1..992cb9cf7 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs
@@ -16,7 +16,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.MenuBar;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar;
 
 public partial class MenuBarViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml
index 564d776fd..92a505def 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:playback1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Playback"
+             xmlns:playback="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Playback"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="48"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Playback.PlaybackView"
-             x:DataType="playback1:PlaybackViewModel">
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Playback.PlaybackView"
+             x:DataType="playback:PlaybackViewModel">
     <Grid Margin="8 0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
similarity index 66%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
index de774d07a..b0f6af0c5 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackView.axaml.cs
@@ -1,6 +1,7 @@
+using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Playback;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
 
 public partial class PlaybackView : ReactiveUserControl<PlaybackViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
index fc4616971..68790a5bd 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Playback/PlaybackViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -11,7 +11,7 @@ using Avalonia.Threading;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Playback;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
 
 public partial class PlaybackViewModel : ActivatableViewModelBase
 {
@@ -154,7 +154,7 @@ public partial class PlaybackViewModel : ActivatableViewModelBase
         {
             RepeatTimeline = false;
             RepeatSegment = true;
-            this.RaisePropertyChanged(nameof(Screens.ProfileEditor.Playback.PlaybackViewModel.Repeating));
+            this.RaisePropertyChanged(nameof(Repeating));
         }
         else if (RepeatSegment)
         {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
index 45f641624..7a41fd788 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Behaviors/ProfileTreeViewDropHandler.cs
@@ -8,7 +8,7 @@ using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using Avalonia.Xaml.Interactions.DragAndDrop;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Behaviors;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Behaviors;
 
 public class ProfileTreeViewDropHandler : DropHandlerBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
similarity index 79%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
index 814fbebe6..c8fc82acc 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
@@ -2,9 +2,9 @@
              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:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs"
+             xmlns:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs.ProfileElementRenameView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs.ProfileElementRenameView"
              x:DataType="contentDialogs1:ProfileElementRenameViewModel">
     <StackPanel>
         <TextBox Name="NameTextBox" Text="{CompiledBinding ProfileElementName}" Watermark="Profile element name" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
similarity index 89%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
index 48fefb9ba..62d18c844 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
 
 public partial class ProfileElementRenameView : ReactiveUserControl<ProfileElementRenameViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
index 21e6723e8..7900f8740 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
@@ -8,7 +8,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using ReactiveUI.Validation.Extensions;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
 
 public partial class ProfileElementRenameViewModel : ContentDialogViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
index 48ff350b8..bc3719e80 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/AdaptionHintViewModelBase.cs
@@ -3,7 +3,7 @@ using Artemis.Core;
 using Artemis.UI.Shared;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public abstract class AdaptionHintViewModelBase : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
index e3a0dbd6e..1dd2b3b56 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
+             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.CategoryAdaptionHintView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.CategoryAdaptionHintView"
              x:DataType="adaptionHints1:CategoryAdaptionHintViewModel">
     <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
         <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
similarity index 66%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
index 1b4eea833..74033e084 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public partial class CategoryAdaptionHintView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
similarity index 79%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
index 19732ad8e..701d65d4f 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintViewModel.cs
@@ -1,6 +1,6 @@
 using Artemis.Core;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public class CategoryAdaptionHintViewModel : AdaptionHintViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
index 6e7358969..4bced01ac 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
+             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.DeviceAdaptionHintView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.DeviceAdaptionHintView"
              x:DataType="adaptionHints1:DeviceAdaptionHintViewModel">
     <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
         <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
similarity index 66%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
index 21b7c750e..f554ee3eb 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public partial class DeviceAdaptionHintView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
index 817acb874..bac3bf9fa 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintViewModel.cs
@@ -1,6 +1,6 @@
 using Artemis.Core;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public class DeviceAdaptionHintViewModel : AdaptionHintViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
similarity index 89%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
index 8b05044c9..dd75ae0c6 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
+             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.KeyboardSectionAdaptionHintView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.KeyboardSectionAdaptionHintView"
              x:DataType="adaptionHints1:KeyboardSectionAdaptionHintViewModel">
     <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
         <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
similarity index 68%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
index 8c3076eb0..c721fe76d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public partial class KeyboardSectionAdaptionHintView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
similarity index 81%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
index f7b6087ca..9aaf9de51 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintViewModel.cs
@@ -1,6 +1,6 @@
 using Artemis.Core;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public class KeyboardSectionAdaptionHintViewModel : AdaptionHintViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
index eb94f1f7b..d2c807616 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
+             xmlns:adaptionHints1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintView"
              x:DataType="adaptionHints1:SingleLedAdaptionHintViewModel">
     <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto">
         <StackPanel Grid.ColumnSpan="2" Margin="0 0 0 5">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
similarity index 67%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
index 7cd37f523..32f0e7f59 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public partial class SingleLedAdaptionHintView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
index 06e2c2558..8652f28fc 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/SingleLedAdaptionHintViewModel.cs
@@ -7,7 +7,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using RGB.NET.Core;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
 public partial class SingleLedAdaptionHintViewModel : AdaptionHintViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
index a00cb3ec5..1fc299d1b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml
@@ -4,9 +4,9 @@
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-                     xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs"
+                     xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs"
                      mc:Ignorable="d"
-                     x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.LayerHintsDialogView"
+                     x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.LayerHintsDialogView"
                      x:DataType="dialogs1:LayerHintsDialogViewModel"
                      WindowStartupLocation="CenterOwner"
                      Icon="/Assets/Images/Logo/application.ico"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
similarity index 77%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
index 3a8f11bf6..44185a14a 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs
@@ -1,6 +1,6 @@
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
 
 public partial class LayerHintsDialogView : ReactiveAppWindow<LayerHintsDialogViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
index d46064120..81dc50a79 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs
@@ -6,12 +6,12 @@ using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 using Artemis.UI.Shared;
 using DynamicData;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
 
 public class LayerHintsDialogViewModel : DialogViewModelBase<bool>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
index 0d9f1d902..0c5932680 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree"
+             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.FolderTreeItemView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.FolderTreeItemView"
              x:DataType="profileTree1:FolderTreeItemViewModel">
     <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto">
         <HyperlinkButton Grid.Column="0" 
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
similarity index 74%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
index 7d28e9fa6..3795daf54 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public partial class FolderTreeItemView : ReactiveUserControl<FolderTreeItemViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
index 15a0c638a..2dbee879f 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs
@@ -9,7 +9,7 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public class FolderTreeItemViewModel : TreeItemViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
index 361dbecfb..1589a6d1c 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree"
+             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.LayerTreeItemView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.LayerTreeItemView"
              x:DataType="profileTree1:LayerTreeItemViewModel">
     <Grid ColumnDefinitions="Auto,Auto,*,Auto,Auto">
         <HyperlinkButton Grid.Column="0" 
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
similarity index 74%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
index a6738cd81..1790f1d0e 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public partial class LayerTreeItemView : ReactiveUserControl<LayerTreeItemViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
index a7f674722..e2bcd895d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
@@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public class LayerTreeItemViewModel : TreeItemViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
index 7363f167c..5a8ce44e1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml
@@ -5,10 +5,10 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:behaviors="clr-namespace:Artemis.UI.Behaviors"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree"
-             xmlns:behaviors1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Behaviors"
+             xmlns:profileTree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree"
+             xmlns:behaviors1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Behaviors"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ProfileTreeView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ProfileTreeView"
              x:DataType="profileTree1:ProfileTreeViewModel">
     <!-- These cause binding errors, not my fault - https://github.com/AvaloniaUI/Avalonia/issues/5762 -->
     <UserControl.KeyBindings>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
index b25d34a88..76464fd59 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs
@@ -10,7 +10,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public partial class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
index 911f583c5..6cd2cd623 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs
@@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public partial class ProfileTreeViewModel : TreeItemViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
index cd0ef79fd..f475e3cf7 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
@@ -10,8 +10,8 @@ using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.ContentDialogs;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.ContentDialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
@@ -21,7 +21,7 @@ using Avalonia.ReactiveUI;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
 
 public abstract partial class TreeItemViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
index d65f801c3..078c60a1a 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:dataBinding="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding"
+             xmlns:dataBinding="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding.DataBindingView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding.DataBindingView"
              x:DataType="dataBinding:DataBindingViewModel">
     <Grid RowDefinitions="48,*">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*" Background="{DynamicResource ControlFillColorDefaultBrush}">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
similarity index 70%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
index 693bcf8a6..b7075e087 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
 
 public partial class DataBindingView : ReactiveUserControl<DataBindingViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
index e60cfb7e4..eadeaff59 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs
@@ -14,7 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
 
 public class DataBindingViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
index e4a469974..70db0b0c6 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:layerEffects="clr-namespace:Artemis.Core.LayerEffects;assembly=Artemis.Core"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs"
+             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs.AddEffectView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs.AddEffectView"
              x:DataType="dialogs1:AddEffectViewModel"
              Width="500">
     <Grid RowDefinitions="Auto,*">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
similarity index 88%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
index b81dd40a4..a96d0f7a5 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
 
 public partial class AddEffectView : ReactiveUserControl<AddEffectViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
index 876155cfd..b953694ba 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/AddEffectViewModel.cs
@@ -11,7 +11,7 @@ using DynamicData;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
 
 public partial class AddEffectViewModel : ContentDialogViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
index 8f0cd5b49..3429e38b6 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:attachedProperties="clr-namespace:Artemis.UI.Shared.AttachedProperties;assembly=Artemis.UI.Shared"
-             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs"
+             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs.TimelineSegmentEditView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs.TimelineSegmentEditView"
              x:DataType="dialogs1:TimelineSegmentEditViewModel">
     <StackPanel>
         <controls:NumberBox Name="LengthNumberBox" 
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
similarity index 74%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
index 746d30140..6730fadf8 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
 
 public partial class TimelineSegmentEditView : ReactiveUserControl<TimelineSegmentEditViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
similarity index 80%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
index 70a24c322..229884e09 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
 
 public class TimelineSegmentEditViewModel : ContentDialogViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml
index bf7685b8f..587966965 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml
@@ -4,12 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:Artemis.UI.Controls"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:properties="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties"
+             xmlns:properties="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
              mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="350"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.PropertiesView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.PropertiesView"
              x:DataType="properties:PropertiesViewModel">
     <UserControl.Styles>
-        <StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
+        <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
     </UserControl.Styles>
     <UserControl.Resources>
         <converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
index 759623965..e6c520279 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesView.axaml.cs
@@ -6,7 +6,7 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
 
 public partial class PropertiesView : ReactiveUserControl<PropertiesViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
index f2eeb9726..d7e6b1f78 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertiesViewModel.cs
@@ -11,17 +11,17 @@ using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
-using Artemis.UI.Screens.Profile.ProfileEditor.Playback;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.DataBinding;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Playback;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.DataBinding;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
 
 public partial class PropertiesViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
index 8016da781..87597a64d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs
@@ -7,15 +7,15 @@ using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
 using Artemis.UI.DryIoc.Factories;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 using Artemis.UI.Shared.Services.PropertyInput;
 using DynamicData;
 using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
 
 public partial class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModel.cs
similarity index 92%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModel.cs
index 4262ab28e..0e3b402c1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModel.cs
@@ -2,12 +2,12 @@
 using System.Collections.ObjectModel;
 using Artemis.Core;
 using Artemis.UI.DryIoc.Factories;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 using DynamicData;
 using PropertyChanged.SourceGenerator;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
 
 public partial class PropertyViewModel : PropertyViewModelBase, IDisposable
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
similarity index 79%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
index ab9817c20..c7d7dcd33 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/PropertyViewModelBase.cs
@@ -2,7 +2,7 @@
 using Artemis.Core;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
 
 public abstract class PropertyViewModelBase : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
similarity index 72%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
index 87f4d5223..0c424dfa3 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/ITimelinePropertyViewModel.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using Artemis.Core;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public interface ITimelinePropertyViewModel : IReactiveObject
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
similarity index 90%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
index 99e76ada3..e57812713 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/ITimelineKeyframeViewModel.cs
@@ -3,7 +3,7 @@ using System.Reactive;
 using Artemis.Core;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 
 public interface ITimelineKeyframeViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
index c0d3f1bdf..bfd83959f 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes"
+             xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes.TimelineEasingView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes.TimelineEasingView"
              x:DataType="keyframes1:TimelineEasingViewModel">
     <Grid ColumnDefinitions="25,30,*">
         <avalonia:MaterialIcon Grid.Column="0" Kind="Check" IsVisible="{CompiledBinding IsEasingModeSelected}" HorizontalAlignment="Left"/>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
similarity index 65%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
index 057ecf6fb..b2e0d037e 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 
 public partial class TimelineEasingView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
index 363dc8fa3..fcd35d09e 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs
@@ -6,7 +6,7 @@ using Avalonia;
 using Humanizer;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 
 public class TimelineEasingViewModel : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
index e8f4c167a..d7636fdeb 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes"
+             xmlns:keyframes1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView"
              ClipToBounds="False">
     <Ellipse Fill="{DynamicResource SystemAccentColorLight2}"
              Stroke="White"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
index abb7b51bc..7afb4a813 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 
 public partial class TimelineKeyframeView : ReactiveUserControl<ITimelineKeyframeViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
index 18a5a5a88..3fc3931a1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
@@ -19,7 +19,7 @@ using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 
 public partial class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineKeyframeViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
similarity index 92%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
index 4b6d3fc7e..9a0cd2768 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments"
+             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.EndSegmentView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.EndSegmentView"
              x:DataType="segments1:EndSegmentViewModel">
     <UserControl.Styles>
-        <StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
+        <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
index 5ab5af82e..d89c4f4c7 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentView.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public partial class EndSegmentView : ReactiveUserControl<EndSegmentViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
index 567039090..6f00c1b5d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/EndSegmentViewModel.cs
@@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public class EndSegmentViewModel : TimelineSegmentViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
index 9bdd7b4f4..c5060ab80 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments"
+             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.MainSegmentView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.MainSegmentView"
              x:DataType="segments1:MainSegmentViewModel">
     <UserControl.Styles>
-        <StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
+        <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
index b48f2cf7d..4e20cfc39 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentView.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public partial class MainSegmentView : ReactiveUserControl<MainSegmentViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
index 2688189bf..7172e0e99 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/MainSegmentViewModel.cs
@@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public class MainSegmentViewModel : TimelineSegmentViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
similarity index 100%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
similarity index 92%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
index e2289262a..51ac4fb92 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments"
+             xmlns:segments1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="18"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments.StartSegmentView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments.StartSegmentView"
              x:DataType="segments1:StartSegmentViewModel">
     <UserControl.Styles>
-        <StyleInclude Source="/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
+        <StyleInclude Source="/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/Segment.axaml" />
     </UserControl.Styles>
     <Border Classes="segment-container">
         <Grid Name="SegmentGrid"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
index fee59c2b9..b80f51a4b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentView.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public partial class StartSegmentView : ReactiveUserControl<StartSegmentViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
index 6e27862d4..eadae620c 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/StartSegmentViewModel.cs
@@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public class StartSegmentViewModel : TimelineSegmentViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
index a3439f132..709571d2d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs
@@ -6,7 +6,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
@@ -15,7 +15,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 
 public abstract partial class TimelineSegmentViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
index 35b9682df..3910ea3f1 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:system="clr-namespace:System;assembly=netstandard"
-             xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline"
-             xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties"
+             xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline"
+             xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineGroupView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineGroupView"
              x:DataType="timeline1:TimelineGroupViewModel">
     <Grid RowDefinitions="28,1,Auto">
         <ItemsControl Grid.Row="0"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
similarity index 72%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
index 8e0d3ec9c..7ee09a9be 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public partial class TimelineGroupView : ReactiveUserControl<TimelineGroupViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
index 6a6b6d2be..cb9281d44 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs
@@ -8,7 +8,7 @@ using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public partial class TimelineGroupViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
similarity index 90%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
index ab8004516..1ce25e725 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelinePropertyView">
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelinePropertyView">
     <Border Height="29" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource ButtonBorderBrush}">
         <ItemsControl ItemsSource="{Binding KeyframeViewModels}">
             <ItemsControl.ItemsPanel>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
similarity index 73%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
index e2afd768c..012f3adcd 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public partial class TimelinePropertyView : ReactiveUserControl<ITimelinePropertyViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
index df7e5fe59..a5eb1bcf4 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs
@@ -5,13 +5,13 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using DynamicData;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public class TimelinePropertyViewModel<T> : ActivatableViewModelBase, ITimelinePropertyViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
index cada9d795..fd8ed76c3 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline"
-             xmlns:properties="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties"
+             xmlns:timeline1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline"
+             xmlns:properties="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.TimelineView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.TimelineView"
              x:DataType="timeline1:TimelineViewModel">
     <UserControl.Resources>
     </UserControl.Resources>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
similarity index 90%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
index 511cf600b..fac533bdf 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineView.axaml.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
 using Artemis.UI.Shared.Events;
 using Artemis.UI.Shared.Extensions;
 using Avalonia;
@@ -8,7 +8,7 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public partial class TimelineView : ReactiveUserControl<TimelineViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs
index 15f10a0a1..2d2c984cf 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Timeline/TimelineViewModel.cs
@@ -8,15 +8,15 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.UI.Models;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Keyframes;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline.Segments;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Keyframes;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline.Segments;
 using Artemis.UI.Services.ProfileEditor.Commands;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Extensions;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Timeline;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Timeline;
 
 public class TimelineViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
index ac51f6d62..53d10e130 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
@@ -2,9 +2,9 @@
              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:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs"
+             xmlns:contentDialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView"
              x:DataType="contentDialogs1:LayerEffectRenameViewModel">
     <StackPanel>
         <TextBox Name="NameTextBox" Text="{CompiledBinding LayerEffectName}" Watermark="Layer effect name" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs
similarity index 88%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs
index ae413e46a..a3b80f061 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs;
 
 public partial class LayerEffectRenameView : ReactiveUserControl<LayerEffectRenameViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
index 34d44ed5e..2bca328cf 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
@@ -8,7 +8,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using ReactiveUI.Validation.Extensions;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs;
 
 public partial class LayerEffectRenameViewModel : ContentDialogViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml
index 8ebe14b95..65475153c 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:layerBrushes="clr-namespace:Artemis.Core.LayerBrushes;assembly=Artemis.Core"
-             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs"
+             xmlns:dialogs1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView"
              x:DataType="dialogs1:LayerBrushPresetViewModel"
              Width="500">
   <Grid RowDefinitions="Auto,*">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs
index d81777e4d..5ad7af955 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs;
 
 public partial class LayerBrushPresetView : ReactiveUserControl<LayerBrushPresetViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs
index 33ab6f923..63b03b573 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs
@@ -7,7 +7,7 @@ using DynamicData;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.Dialogs;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.Dialogs;
 
 public partial class LayerBrushPresetViewModel : ContentDialogViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs
index bc1eb16ea..ce05004c8 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/ITreePropertyViewModel.cs
@@ -1,7 +1,7 @@
 using Artemis.Core;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 
 public interface ITreePropertyViewModel : IReactiveObject
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml
index ea10aba37..8157ba895 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml
@@ -6,10 +6,10 @@
              xmlns:sharedConverters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:tree="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree"
-             xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties"
+             xmlns:tree="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree"
+             xmlns:properties1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.TreeGroupView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.TreeGroupView"
              x:DataType="tree:TreeGroupViewModel">
     <UserControl.Resources>
         <converters:PropertyTreeMarginConverter x:Key="PropertyTreeMarginConverter" Length="20" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs
similarity index 86%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs
index 253d98d9c..ef04ea787 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 
 public partial class TreeGroupView : ReactiveUserControl<TreeGroupViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs
index b3cb38bb1..d7fe7258f 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs
@@ -8,8 +8,8 @@ using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
 using Artemis.UI.Exceptions;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.ContentDialogs;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.ContentDialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.LayerBrushes;
 using Artemis.UI.Shared.LayerEffects;
@@ -19,7 +19,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 
 public class TreeGroupViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml
index 07c62ad53..b5008e3dc 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:tree1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree"
+             xmlns:tree1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree.TreePropertyView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree.TreePropertyView"
              x:DataType="tree1:ITreePropertyViewModel">
     <UserControl.Resources>
         <converters:PropertyTreeMarginConverter x:Key="PropertyTreeMarginConverter" Length="20" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs
index 666bc8410..91d0bf19b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 
 public partial class TreePropertyView : ReactiveUserControl<ITreePropertyViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs
index 27f54a399..aa2cf1445 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Tree/TreePropertyViewModel.cs
@@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using Artemis.UI.Shared.Services.PropertyInput;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Tree;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Tree;
 
 internal class TreePropertyViewModel<T> : ActivatableViewModelBase, ITreePropertyViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml
index 45db57691..f270bca4b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml
@@ -3,12 +3,12 @@
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-                     xmlns:local="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows"
+                     xmlns:local="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows"
                      x:DataType="local:BrushConfigurationWindowViewModel" 
                      mc:Ignorable="d"
                      d:DesignWidth="800"
                      d:DesignHeight="450"
-                     x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows.BrushConfigurationWindowView"
+                     x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows.BrushConfigurationWindowView"
                      Icon="/Assets/Images/Logo/application.ico"
                      Title="Artemis | Brush configuration"
                      Width="{CompiledBinding Configuration.DialogWidth}"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
similarity index 91%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
index 85fb0e956..dd8742b34 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs
@@ -2,7 +2,7 @@ using System.ComponentModel;
 using Artemis.UI.Shared;
 using Avalonia.Markup.Xaml;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows;
 
 public partial class BrushConfigurationWindowView : ReactiveAppWindow<BrushConfigurationWindowViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
index 633a92a28..8bbf02f88 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowViewModel.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.LayerBrushes;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows;
 
 public class BrushConfigurationWindowViewModel : DialogViewModelBase<object?>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml
similarity index 87%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml
index 886fd487c..862355ade 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml
@@ -3,12 +3,12 @@
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-                     xmlns:local="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows"
+                     xmlns:local="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows"
                      x:DataType="local:EffectConfigurationWindowViewModel"
                      mc:Ignorable="d"
                      d:DesignWidth="800"
                      d:DesignHeight="450"
-                     x:Class="Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows.EffectConfigurationWindowView"
+                     x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows.EffectConfigurationWindowView"
                      Icon="/Assets/Images/Logo/application.ico"
                      Title="Artemis | Effect configuration"
                      Width="{CompiledBinding Configuration.DialogWidth}"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
similarity index 91%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
index 5a87687e9..679086e75 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs
@@ -2,7 +2,7 @@ using System.ComponentModel;
 using Artemis.UI.Shared;
 using Avalonia.Markup.Xaml;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows;
 
 public partial class EffectConfigurationWindowView : ReactiveAppWindow<EffectConfigurationWindowViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
similarity index 93%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
index 4f9922894..65fde0979 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowViewModel.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.LayerEffects;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.Properties.Windows;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.Properties.Windows;
 
 public class EffectConfigurationWindowViewModel : DialogViewModelBase<object?>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml
index 30c64a103..afa31ddb8 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:core="clr-namespace:Artemis.Core;assembly=Artemis.Core"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="23"
-             xmlns:statusBar="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.StatusBar"
+             xmlns:statusBar="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar"
              x:DataType="statusBar:StatusBarViewModel"
-    x:Class="Artemis.UI.Screens.Profile.ProfileEditor.StatusBar.StatusBarView">
+    x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar.StatusBarView">
     <UserControl.Styles>
         <Style Selector="Border.status-message-border">
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs
similarity index 74%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs
index 5ca7af871..02009012d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.StatusBar;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar;
 
 public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs
index af921502d..9f4484d44 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs
@@ -7,7 +7,7 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.StatusBar;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar;
 
 public partial class StatusBarViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml
similarity index 90%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml
index fa39685b4..dea78d8cc 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools.SelectionAddToolView" ClipToBounds="False">
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools.SelectionAddToolView" ClipToBounds="False">
     <Grid>
         <shared:SelectionRectangle InputElement="{CompiledBinding $parent[ZoomBorder]}"
                                    BorderBrush="{DynamicResource SystemAccentColor}"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs
similarity index 88%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs
index 3eec861bb..32adcf338 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolView.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.Skia;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public partial class SelectionAddToolView : ReactiveUserControl<SelectionAddToolViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs
index 71e0397fe..afcd5877a 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionAddToolViewModel.cs
@@ -11,7 +11,7 @@ using Material.Icons;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public class SelectionAddToolViewModel : ToolViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml
similarity index 92%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml
index 65362afa8..82a796f31 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml
@@ -5,7 +5,7 @@
              xmlns:paz="clr-namespace:Avalonia.Controls.PanAndZoom;assembly=Avalonia.Controls.PanAndZoom"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools.SelectionRemoveToolView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools.SelectionRemoveToolView"
              ClipToBounds="False">
     <Grid>
         <shared:SelectionRectangle InputElement="{CompiledBinding $parent[paz:ZoomBorder]}"
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs
similarity index 86%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs
index a050f6b15..fca9fdcc5 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolView.axaml.cs
@@ -2,7 +2,7 @@ using Artemis.UI.Shared.Events;
 using Avalonia.ReactiveUI;
 using Avalonia.Skia;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public partial class SelectionRemoveToolView : ReactiveUserControl<SelectionRemoveToolViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs
index f8dcfa7cc..3918281b0 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/SelectionRemoveToolViewModel.cs
@@ -11,7 +11,7 @@ using Material.Icons;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public class SelectionRemoveToolViewModel : ToolViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml
index b09c38c52..04d9fd2ac 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml
@@ -2,10 +2,10 @@
              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:tools1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools"
+             xmlns:tools="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools.TransformToolView"
-             x:DataType="tools1:TransformToolViewModel"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools.TransformToolView"
+             x:DataType="tools:TransformToolViewModel"
              ClipToBounds="False">
     <UserControl.Styles>
         <Style Selector=":is(Control).unscaled">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
index dcc19ec36..f45342adf 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
@@ -10,14 +10,16 @@ using Avalonia.Controls.PanAndZoom;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Transformation;
 using Avalonia.ReactiveUI;
 using Avalonia.Skia;
+using Avalonia.VisualTree;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public partial class TransformToolView : ReactiveUserControl<TransformToolViewModel>
 {
@@ -45,7 +47,7 @@ public partial class TransformToolView : ReactiveUserControl<TransformToolViewMo
 
         _handles.Add(AnchorPoint);
 
-        this.WhenActivated(d => ViewModel.WhenAnyValue<TransformToolViewModel, double>(vm => vm.Rotation).Subscribe(_ => UpdateTransforms()).DisposeWith(d));
+        this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Rotation).Subscribe(_ => UpdateTransforms()).DisposeWith(d));
     }
 
     private void UpdateTransforms()
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs
similarity index 99%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs
index 1716f0f98..72d3d6282 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Tools/TransformToolViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -9,12 +9,13 @@ using Artemis.UI.Shared.Extensions;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using Avalonia;
+using Avalonia.Input;
 using Material.Icons;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Tools;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Tools;
 
 public partial class TransformToolViewModel : ToolViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
index 5193ab87b..48a5c7e0d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml
@@ -5,10 +5,10 @@
              xmlns:paz="clr-namespace:Avalonia.Controls.PanAndZoom;assembly=Avalonia.Controls.PanAndZoom"
              xmlns:core="clr-namespace:Artemis.Core;assembly=Artemis.Core"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:visualEditor1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor"
-             xmlns:visualizers="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers"
+             xmlns:visualEditor1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor"
+             xmlns:visualizers="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.VisualEditorView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.VisualEditorView"
              x:DataType="visualEditor1:VisualEditorViewModel">
     <UserControl.Resources>
         <VisualBrush x:Key="LargeCheckerboardBrush" TileMode="Tile" Stretch="Uniform" SourceRect="0,0,20,20">
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
index 0d5ee2008..4128edef4 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
@@ -10,7 +10,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor;
 
 public partial class VisualEditorView : ReactiveUserControl<VisualEditorViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs
index 5db1a5c35..8c761f44f 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs
@@ -8,7 +8,7 @@ using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
-using Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+using Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using DynamicData;
@@ -16,7 +16,7 @@ using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor;
 
 public partial class VisualEditorViewModel : ActivatableViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs
similarity index 69%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs
index 0fee58c46..02b813ed3 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/IVisualizerViewModel.cs
@@ -1,6 +1,6 @@
 using Artemis.Core;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 
 public interface IVisualizerViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml
index dc1aee5e8..ab34ee678 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml
@@ -2,9 +2,9 @@
              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:visualizers1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers"
+             xmlns:visualizers1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerView"
              x:DataType="visualizers1:LayerShapeVisualizerViewModel"
              ClipToBounds="False">
     <UserControl.Styles>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs
index 04ca37c4c..39991fef9 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerView.axaml.cs
@@ -8,7 +8,7 @@ using Avalonia.LogicalTree;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 
 public partial class LayerShapeVisualizerView : ReactiveUserControl<LayerShapeVisualizerViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs
similarity index 97%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs
index f4b2cb634..cd9566101 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerShapeVisualizerViewModel.cs
@@ -13,7 +13,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 
 public partial class LayerShapeVisualizerViewModel : ActivatableViewModelBase, IVisualizerViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml
similarity index 91%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml
index 88cafe959..efc205a5d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml
@@ -2,9 +2,9 @@
              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:visualizers1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers"
+             xmlns:visualizers1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerView"
              x:DataType="visualizers1:LayerVisualizerViewModel"
              ClipToBounds="False">
     <UserControl.Styles>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs
similarity index 94%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs
index 388511aad..8fcf8fb30 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerView.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls.PanAndZoom;
 using Avalonia.LogicalTree;
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 
 public partial class LayerVisualizerView : ReactiveUserControl<LayerVisualizerViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs
similarity index 95%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs
index e0198b5c6..e06c4db98 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/Panels/VisualEditor/Visualizers/LayerVisualizerViewModel.cs
@@ -10,7 +10,7 @@ using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 using SkiaSharp;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor.Visualizers;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor.Visualizers;
 
 public partial class LayerVisualizerViewModel : ActivatableViewModelBase, IVisualizerViewModel
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml
similarity index 89%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml
index 326777853..9593526ab 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-             xmlns:profileEditor1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor"
+             xmlns:profileEditor1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorTitleBarView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorTitleBarView"
              x:DataType="profileEditor1:ProfileEditorTitleBarViewModel">
     <Grid ColumnDefinitions="*,Auto">
         <ContentControl Grid.Row="0" Grid.Column="0" Content="{CompiledBinding MenuBarViewModel}" windowing:AppWindow.AllowInteractionInTitleBar="True" HorizontalAlignment="Left" />
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml.cs
similarity index 76%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml.cs
index bff39f43f..e7b12bbc0 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor;
 
 public partial class ProfileEditorTitleBarView : UserControl
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarViewModel.cs
similarity index 81%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarViewModel.cs
index a099f05b9..d7aea21be 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorTitleBarViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorTitleBarViewModel.cs
@@ -1,8 +1,8 @@
-using Artemis.UI.Screens.Profile.ProfileEditor.MenuBar;
+using Artemis.UI.Screens.Profiles.ProfileEditor.MenuBar;
 using Artemis.UI.Screens.Root;
 using Artemis.UI.Shared;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor;
 
 public class ProfileEditorTitleBarViewModel : ViewModelBase
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml
similarity index 98%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml
index b83374c14..5b5dc697d 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml
@@ -5,9 +5,9 @@
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:shared="clr-namespace:Artemis.UI.Shared.Services.ProfileEditor;assembly=Artemis.UI.Shared"
-             xmlns:profileEditor1="clr-namespace:Artemis.UI.Screens.Profile.ProfileEditor"
+             xmlns:profileEditor1="clr-namespace:Artemis.UI.Screens.Profiles.ProfileEditor"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Artemis.UI.Screens.Profile.ProfileEditor.ProfileEditorView"
+             x:Class="Artemis.UI.Screens.Profiles.ProfileEditor.ProfileEditorView"
              x:DataType="profileEditor1:ProfileEditorViewModel"
              Focusable="True">
     <UserControl.Resources>
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml.cs
similarity index 78%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml.cs
index 0a8d5e251..52f04231b 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorView.axaml.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor;
 
 public partial class ProfileEditorView : ReactiveUserControl<ProfileEditorViewModel>
 {
diff --git a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorViewModel.cs
similarity index 96%
rename from src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorViewModel.cs
rename to src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorViewModel.cs
index 4c303d836..ae2c4f738 100644
--- a/src/Artemis.UI/Screens/Profile/ProfileEditor/ProfileEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/Profiles/ProfileEditor/ProfileEditorViewModel.cs
@@ -8,11 +8,11 @@ using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.Profile.ProfileEditor.DisplayCondition;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree;
-using Artemis.UI.Screens.Profile.ProfileEditor.Properties;
-using Artemis.UI.Screens.Profile.ProfileEditor.StatusBar;
-using Artemis.UI.Screens.Profile.ProfileEditor.VisualEditor;
+using Artemis.UI.Screens.Profiles.ProfileEditor.DisplayCondition;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree;
+using Artemis.UI.Screens.Profiles.ProfileEditor.Properties;
+using Artemis.UI.Screens.Profiles.ProfileEditor.StatusBar;
+using Artemis.UI.Screens.Profiles.ProfileEditor.VisualEditor;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
@@ -25,7 +25,7 @@ using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.Profile.ProfileEditor;
+namespace Artemis.UI.Screens.Profiles.ProfileEditor;
 
 public partial class ProfileEditorViewModel : RoutableScreen<ProfileEditorViewModelParameters>, IMainScreenViewModel
 {
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsLayerViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsLayerViewModel.cs
index c00138498..331f4a36d 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsLayerViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsLayerViewModel.cs
@@ -3,8 +3,8 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs;
-using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using PropertyChanged.SourceGenerator;
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs
index fea2d631c..9d044863e 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs
@@ -6,8 +6,8 @@ using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.Profile.ProfileEditor.ProfileTree.Dialogs;
-using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.Profiles.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop.Handlers.UploadHandlers;