diff --git a/BeWo/AI/View/AiChatView.xaml.cs b/BeWo/AI/View/AiChatView.xaml.cs
index 4c17cdfd8..d8754b408 100644
--- a/BeWo/AI/View/AiChatView.xaml.cs
+++ b/BeWo/AI/View/AiChatView.xaml.cs
@@ -13,7 +13,6 @@ using BeWo.Core;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
 using BeWo.View;
-using BeWo.View.Controls;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
 
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index e4269a8c6..57c3c4287 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -136,16 +136,13 @@
     <Compile Include="ViewModel\View\Dialogs\BaseDialogViewModel.cs" />
     <Compile Include="ViewModel\View\Dialogs\GkvAbrechnungDialogViewModel.cs" />
     <Compile Include="ViewModel\View\WindowViewModel.cs" />
-    <Compile Include="View\Controls\AiPromptbausteinDetailView.xaml.cs">
+    <Compile Include="View\Detail\AI\AiPromptbausteinDetailView.xaml.cs">
       <DependentUpon>AiPromptbausteinDetailView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Core\WaitLayer3.xaml.cs">
       <DependentUpon>WaitLayer3.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\Administration\AiPromptbausteinEditDialog.xaml.cs">
-      <DependentUpon>AiPromptbausteinEditDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\Detail\Administration\AiPromptbausteinTreeView.xaml.cs">
+    <Compile Include="View\Detail\AI\AiPromptbausteinTreeView.xaml.cs">
       <DependentUpon>AiPromptbausteinTreeView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModel\StoredFileVM.cs" />
@@ -201,7 +198,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Controls\AiPromptbausteinDetailView.xaml">
+    <Page Include="View\Detail\AI\AiPromptbausteinDetailView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -209,11 +206,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Detail\Administration\AiPromptbausteinEditDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\Detail\Administration\AiPromptbausteinTreeView.xaml">
+    <Page Include="View\Detail\AI\AiPromptbausteinTreeView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
index 8ebd9a0c4..8229bfa5c 100644
--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
@@ -17,7 +17,6 @@ using BeWo.Core;
 using BeWo.Core.Service;
 using BeWo.ViewModel;
 using BeWo.ServiceProxy;
-using BeWo.View.Detail;
 using BS.Shared.Extensions;
 using BS.Shared;
 using BS.Shared.Core;
diff --git a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
index 621122f37..c054b381c 100644
--- a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
@@ -27,7 +27,6 @@ using System.Windows.Media.Imaging;
 using BeWo.Controls;
 using BeWo.Core;
 using BeWo.Core.Service;
-using BeWo.View.Detail;
 using BeWo.ViewModel.ListViewModel;
 using BS.Shared;
 using BS.Shared.Core;
diff --git a/BeWo/Services/BeWoWindowFactory.cs b/BeWo/Services/BeWoWindowFactory.cs
index 56012a91a..ca0ce8aff 100644
--- a/BeWo/Services/BeWoWindowFactory.cs
+++ b/BeWo/Services/BeWoWindowFactory.cs
@@ -1,5 +1,4 @@
-using BeWo.View.Detail.AI;
-using BeWo.View.Windows;
+using BeWo.View.Windows;
 using BeWo.ViewModel.View.AI;
 using BeWo.ViewModel;
 using BeWo.ViewModel.Light;
diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index 60d6c46e5..e59bb1f23 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -1,5 +1,4 @@
-using BeWo.View.Controls;
-using BeWo.View;
+using BeWo.View;
 using BeWo.View.Detail.AI;
 using BeWo.View.Windows;
 using BeWo.ViewModel;
diff --git a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs
index f2a292df0..91d0c417f 100644
--- a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs
+++ b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs
@@ -4,8 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.View.Detail;
-using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 using BS.Shared.DataContracts;
 
diff --git a/BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml.cs b/BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml.cs
index f59e122cd..6a008e6c4 100644
--- a/BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml.cs
+++ b/BeWo/View/Controls/DPCtrlEmployeeContractTooltip.xaml.cs
@@ -4,8 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.View.Detail;
-using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 using BS.Shared.DataContracts;
 
diff --git a/BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml.cs b/BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml.cs
index fe040157e..590ade33d 100644
--- a/BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml.cs
+++ b/BeWo/View/Controls/DPCtrlEmployeeTooltip.xaml.cs
@@ -4,8 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.View.Detail;
-using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 using BS.Shared.DataContracts;
 
diff --git a/BeWo/View/Controls/DienstplanerControl.xaml.cs b/BeWo/View/Controls/DienstplanerControl.xaml.cs
index 8a507ee06..886a45f71 100644
--- a/BeWo/View/Controls/DienstplanerControl.xaml.cs
+++ b/BeWo/View/Controls/DienstplanerControl.xaml.cs
@@ -4,8 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.View.Detail;
-using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 
 namespace BeWo.View.Controls
diff --git a/BeWo/View/Controls/MonthPicker.xaml.cs b/BeWo/View/Controls/MonthPicker.xaml.cs
index b79f50900..81a599f0a 100644
--- a/BeWo/View/Controls/MonthPicker.xaml.cs
+++ b/BeWo/View/Controls/MonthPicker.xaml.cs
@@ -6,8 +6,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using BeWo.View.Detail;
-using BeWo.View.Detail.Report;
 using BeWo.ViewModel;
 
 namespace BeWo.View.Controls
diff --git a/BeWo/View/Controls/AiPromptbausteinDetailView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
similarity index 97%
rename from BeWo/View/Controls/AiPromptbausteinDetailView.xaml
rename to BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
index eddab2422..bd0ea8f60 100644
--- a/BeWo/View/Controls/AiPromptbausteinDetailView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
@@ -1,12 +1,11 @@
 <UserControl
-    x:Class="BeWo.View.Controls.AiPromptbausteinDetailView"
+    x:Class="BeWo.View.Detail.AI.AiPromptbausteinDetailView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:comboboxes="clr-namespace:BeWo.View.Controls.ComboBoxes"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
     xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-    xmlns:local="clr-namespace:BeWo.View.Controls"
     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel.View.Administration"
diff --git a/BeWo/View/Controls/AiPromptbausteinDetailView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml.cs
similarity index 96%
rename from BeWo/View/Controls/AiPromptbausteinDetailView.xaml.cs
rename to BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml.cs
index 20b45fb62..b56286570 100644
--- a/BeWo/View/Controls/AiPromptbausteinDetailView.xaml.cs
+++ b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BeWo.View.Controls
+namespace BeWo.View.Detail.AI
 {
 	/// <summary>
 	/// Interaktionslogik für AiPromptbausteinDetailControl.xaml
diff --git a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
similarity index 92%
rename from BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml
rename to BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
index 6fdf39924..2be86af2c 100644
--- a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
@@ -1,10 +1,10 @@
 <view:BeWoView
-    x:Class="BeWo.View.Detail.Administration.AiPromptbausteinTreeView"
+    x:Class="BeWo.View.Detail.AI.AiPromptbausteinTreeView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:administration="clr-namespace:BeWo.ViewModel.View.Administration"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BeWo.View.Detail.Administration"
+    xmlns:local1="clr-namespace:BeWo.View.Detail.AI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:view="clr-namespace:BeWo.View"
     xmlns:vm="clr-namespace:BeWo.ViewModel"
@@ -18,7 +18,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <local:BoolToFontWeightConverter x:Key="BoolToFontWeightConverter" />
+            <local1:BoolToFontWeightConverter x:Key="BoolToFontWeightConverter" />
         </ResourceDictionary>
     </view:BeWoView.Resources>
     <GroupBox Style="{StaticResource ObjectEditGroupBox}">
@@ -55,8 +55,14 @@
                     ToolTip="Wenn der Bearbeiten Modus aktiviert ist, können Sie Elemente mit Drag und Drop verschieben"
                     Visibility="Visible" />
 
-                <Button Style="{StaticResource ButtonPreviousStyle}" ToolTip="Letzte Änderung rückgängig machen" Visibility="Collapsed"/>
-                <Button Style="{StaticResource ButtonRedoStyle}" ToolTip="Nächste Änderung wiederholen" Visibility="Collapsed"/>
+                <Button
+                    Style="{StaticResource ButtonPreviousStyle}"
+                    ToolTip="Letzte Änderung rückgängig machen"
+                    Visibility="Collapsed" />
+                <Button
+                    Style="{StaticResource ButtonRedoStyle}"
+                    ToolTip="Nächste Änderung wiederholen"
+                    Visibility="Collapsed" />
             </StackPanel>
 
             <GroupBox
@@ -66,16 +72,16 @@
                 <TreeView
                     x:Name="treeView"
                     MinHeight="100"
-                    AllowDrop="True"
                     Padding="3,20,3,3"
+                    AllowDrop="True"
                     ContextMenuService.IsEnabled="{Binding IsChecked, ElementName=EditToggleButton}"
                     ItemContainerStyle="{DynamicResource igoal_treeitemstyle}"
                     ItemTemplate="{DynamicResource igoal_treeitemtemplate}"
-                    TreeViewItem.Selected="treeView_Selected"
                     ItemsSource="{Binding ListVM.VMList, UpdateSourceTrigger=PropertyChanged}"
-                    PreviewMouseRightButtonDown="OnPreviewMouseRightButtonDown"
                     PreviewMouseDown="Grid_PreviewMouseDown"
-                    SelectedItemChanged="treeView_SelectedItemChanged">
+                    PreviewMouseRightButtonDown="OnPreviewMouseRightButtonDown"
+                    SelectedItemChanged="treeView_SelectedItemChanged"
+                    TreeViewItem.Selected="treeView_Selected">
                     <TreeView.Resources>
                         <Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
                             <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
@@ -91,7 +97,7 @@
                             x:Key="igoal_treeitemtemplate"
                             DataType="{x:Type vm:AiPromptbausteinTreeVM}"
                             ItemsSource="{Binding Path=Children.VMList}">
-                            <Grid  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> 
+                            <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
diff --git a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
similarity index 98%
rename from BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs
rename to BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
index 6524f13bc..84cb4b418 100644
--- a/BeWo/View/Detail/Administration/AiPromptbausteinTreeView.xaml.cs
+++ b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
@@ -17,7 +17,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace BeWo.View.Detail.Administration
+namespace BeWo.View.Detail.AI
 {
 	/// <summary>
 	/// Interaktionslogik für AiPromptbausteinTreeView.xaml
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinView.xaml
index 5af88263b..039a89545 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinView.xaml
@@ -1,8 +1,8 @@
 <view:BeWoView
-    x:Class="BeWo.View.Detail.AiPromptbausteinView"
+    x:Class="BeWo.View.Detail.AI.AiPromptbausteinView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:detail="clr-namespace:BeWo.View.Detail"
+    xmlns:detail1="clr-namespace:BeWo.View.Detail.AI"
     xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
     xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
@@ -13,8 +13,8 @@
     VerticalAlignment="Stretch"
     Focusable="True">
     <view:BeWoView.Resources>
-        <detail:IsOnlyForEmployeeRightsConverter2 x:Key="IsOnlyForEmployeeRightsConverter2" />
-        <detail:AiPromptbausteinEditConverter x:Key="AiPromptbausteinEditConverter" />
+        <detail1:IsOnlyForEmployeeRightsConverter2 x:Key="IsOnlyForEmployeeRightsConverter2" />
+        <detail1:AiPromptbausteinEditConverter x:Key="AiPromptbausteinEditConverter" />
     </view:BeWoView.Resources>
     <GroupBox
         Name="root"
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinView.xaml.cs
index 1f7b05219..60e205a70 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinView.xaml.cs
+++ b/BeWo/View/Detail/AI/AiPromptbausteinView.xaml.cs
@@ -17,7 +17,7 @@ using BS.Shared.Translation;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Grid;
 
-namespace BeWo.View.Detail
+namespace BeWo.View.Detail.AI
 {
     public partial class AiPromptbausteinView
     {
diff --git a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
index 4881dfb1d..e27f6914d 100644
--- a/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
@@ -12,7 +12,6 @@ using System.Windows.Navigation;
 using System.Windows.Threading;
 using BeWo.Core;
 using BeWo.ServiceProxy;
-using BeWo.View.Controls;
 using BeWo.View.Windows;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
diff --git a/BeWo/View/Detail/AccountingTransactionBookingView2.xaml.cs b/BeWo/View/Detail/AccountingTransactionBookingView2.xaml.cs
index b77635375..1ffe941f9 100644
--- a/BeWo/View/Detail/AccountingTransactionBookingView2.xaml.cs
+++ b/BeWo/View/Detail/AccountingTransactionBookingView2.xaml.cs
@@ -28,7 +28,6 @@ using BeWo.Core.Service;
 using BeWo.ViewModel.ListViewModel;
 using System.Collections.ObjectModel;
 using BeWo;
-using BeWo.View.Detail;
 
 
 namespace BeWo.View.Detail
diff --git a/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml b/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml
deleted file mode 100644
index 0093f4313..000000000
--- a/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<UserControl
-    x:Class="BeWo.View.Detail.Administration.AiPromptbausteinEditDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:BeWo.View.Detail.Administration"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <Grid />
-</UserControl>
diff --git a/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml.cs b/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml.cs
deleted file mode 100644
index 55dac4a4d..000000000
--- a/BeWo/View/Detail/Administration/AiPromptbausteinEditDialog.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace BeWo.View.Detail.Administration
-{
-	/// <summary>
-	/// Interaktionslogik für AiPromptbausteinEditDialog.xaml
-	/// </summary>
-	public partial class AiPromptbausteinEditDialog : UserControl
-	{
-		public AiPromptbausteinEditDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}
diff --git a/BeWo/View/Detail/GoalImportControl.xaml.cs b/BeWo/View/Detail/GoalImportControl.xaml.cs
index 9e795255e..6f2571d5e 100644
--- a/BeWo/View/Detail/GoalImportControl.xaml.cs
+++ b/BeWo/View/Detail/GoalImportControl.xaml.cs
@@ -19,7 +19,6 @@ using DevExpress.Mvvm.Native;
 using DevExpress.Xpf.Grid;
 using DevExpress.Xpf.Scheduler.UI;
 using DevExpress.XtraExport.Xls;
-using static BeWo.View.Detail.Report.FlexibleReportView;
 
 namespace BeWo.View.Detail
 {
diff --git a/BeWo/View/Detail/Report/IcfImportControl.xaml.cs b/BeWo/View/Detail/Report/IcfImportControl.xaml.cs
index 7142438d5..4c624dbbd 100644
--- a/BeWo/View/Detail/Report/IcfImportControl.xaml.cs
+++ b/BeWo/View/Detail/Report/IcfImportControl.xaml.cs
@@ -21,7 +21,6 @@ using DevExpress.Mvvm.Native;
 using DevExpress.Xpf.Grid;
 using DevExpress.Xpf.Scheduler.UI;
 using DevExpress.XtraExport.Xls;
-using static BeWo.View.Detail.Report.FlexibleReportView;
 
 namespace BeWo.View.Detail.Report
 {
diff --git a/BeWo/View/Detail/WohnheimView.xaml.cs b/BeWo/View/Detail/WohnheimView.xaml.cs
index ee5dfa5f3..5f233ebcb 100644
--- a/BeWo/View/Detail/WohnheimView.xaml.cs
+++ b/BeWo/View/Detail/WohnheimView.xaml.cs
@@ -11,7 +11,6 @@ using BeWo.Core;
 using BeWo.Core.Service;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
-using BeWo.View.Detail.Wohneinheit;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
 using BS.Shared;
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
index 4e5449faf..6166d27dc 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
@@ -52,7 +52,6 @@ using VerticalAlignment = System.Windows.VerticalAlignment;
 using DependencyObject = System.Windows.DependencyObject;
 using BeWo.AI.View;
 using BeWo.AI;
-using BeWo.View.Detail.AI;
 using BeWo.View.Windows;
 using BeWo.Core.Commands;
 using BeWo.ViewModel.View.AI;
diff --git a/BeWo/View/HilfeplanImportView.xaml.cs b/BeWo/View/HilfeplanImportView.xaml.cs
index 38bd387c5..f04dc98d0 100644
--- a/BeWo/View/HilfeplanImportView.xaml.cs
+++ b/BeWo/View/HilfeplanImportView.xaml.cs
@@ -12,7 +12,6 @@ using BeWo.Annotations;
 using BeWo.Core;
 using BeWo.ServiceProxy;
 using BeWo.Validation;
-using BeWo.View.Controls;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
 
diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs
index 17c98b0c8..8f2334434 100644
--- a/BeWo/View/Master/AdministrationView.xaml.cs
+++ b/BeWo/View/Master/AdministrationView.xaml.cs
@@ -569,10 +569,10 @@ namespace BeWo.View.Master
 					return;
 				case nameof(TabitemAiPromptbausteine):
 					VMFactory.CreateAiPromptbausteinListAsync(
-						r => this.Dispatch(() => AddView(TabitemAiPromptbausteine, new AiPromptbausteinView(r))));
+						r => this.Dispatch(() => AddView(TabitemAiPromptbausteine, new Detail.AI.AiPromptbausteinView(r))));
 					return;
 				case nameof(TabitemAiPromptbausteineTree):
-					AddView(TabitemAiPromptbausteineTree, new AiPromptbausteinTreeView());
+					AddView(TabitemAiPromptbausteineTree, new Detail.AI.AiPromptbausteinTreeView());
 					return;
 			}
 
diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
index fe552d81c..9a9ce96bb 100644
--- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
+++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs
@@ -26,7 +26,6 @@ using Microsoft.Win32;
 using BeWo.AI;
 using BeWo.View.Document;
 using DevExpress.Mvvm;
-using BeWo.View.Detail.AI;
 using System;
 using BeWo.View.Windows;
 using System.Collections;
diff --git a/BeWo/View/Report/Auslastung/AuslastungReportView.xaml.cs b/BeWo/View/Report/Auslastung/AuslastungReportView.xaml.cs
index b608ca1d5..11d9f2d5e 100644
--- a/BeWo/View/Report/Auslastung/AuslastungReportView.xaml.cs
+++ b/BeWo/View/Report/Auslastung/AuslastungReportView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core;
 using System.Windows.Documents;
 using BeWo.Core.Service;
 using System.Windows.Threading;
-using BeWo.View.Detail;
 using BeWo.View.Master;
 using BeWo.View.Report.FLSReport;
 using BS.Shared.DataContracts.Compact;
diff --git a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
index 8383f2840..b4d971351 100644
--- a/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
+++ b/BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
@@ -16,7 +16,6 @@ using BeWo.Core;
 using System.Windows.Documents;
 using BeWo.Core.Service;
 using System.Windows.Threading;
-using BeWo.View.Detail;
 using BeWo.View.Master;
 using BeWo.View.Report.FLSReport;
 using BS.Shared.DataContracts.Compact;
diff --git a/BeWo/View/Search/SupportConceptGroupSearchView.cs b/BeWo/View/Search/SupportConceptGroupSearchView.cs
index 95d0308d7..4cd824cb7 100644
--- a/BeWo/View/Search/SupportConceptGroupSearchView.cs
+++ b/BeWo/View/Search/SupportConceptGroupSearchView.cs
@@ -10,7 +10,6 @@ using System.Windows.Media.Imaging;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.Extensions;
-using BeWo.View.Detail;
 using BeWo.View.Navigation.Sorter;
 using BS.Shared.DataContracts.Compact;
 using BeWo.ServiceProxy;
diff --git a/BeWo/View/Windows/BeWoWindowBuilder.cs b/BeWo/View/Windows/BeWoWindowBuilder.cs
index a317ec009..b65c9cfd1 100644
--- a/BeWo/View/Windows/BeWoWindowBuilder.cs
+++ b/BeWo/View/Windows/BeWoWindowBuilder.cs
@@ -1,7 +1,4 @@
-using BeWo.View.Controls;
-using BeWo.View.Detail;
-using BeWo.View.Detail.AI;
-using BeWo.ViewModel;
+using BeWo.ViewModel;
 using BeWo.ViewModel.Light;
 using BS.Shared.Extensions;
 using System;
diff --git a/BeWo/ownChat/ChatServiceCustomer.xaml.cs b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
index 919d95aac..2634c3937 100644
--- a/BeWo/ownChat/ChatServiceCustomer.xaml.cs
+++ b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
@@ -25,7 +25,6 @@ using BeWo.Core.Service;
 using BeWo.PasswortSecurity;
 using BeWo.ViewModel;
 using BeWo.ServiceProxy;
-using BeWo.View.Detail;
 using BS.Shared.Extensions;
 using BS.Shared;
 using BS.Shared.Core;
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 8fd09928c..16d56484a 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>
     </Use64BitIISExpress>
     <IISExpressSSLPort />