diff --git a/WGneu/App.xaml b/WGneu/App.xaml
index 3be84f8..1ce4aae 100644
--- a/WGneu/App.xaml
+++ b/WGneu/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:WGneu"
-             StartupUri="MainWindow.xaml"
+             StartupUri="Windows\MainWindow.xaml"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
         <!--<ResourceDictionary>
diff --git a/WGneu/WGneu.csproj.user b/WGneu/WGneu.csproj.user
index b476a62..8a888a5 100644
--- a/WGneu/WGneu.csproj.user
+++ b/WGneu/WGneu.csproj.user
@@ -7,33 +7,33 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="BankDetailsWindow.xaml.cs">
+    <Compile Update="Windows\BankDetailsWindow.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="MemberAddWindow.xaml.cs">
+    <Compile Update="Windows\MemberAddWindow.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="MemberEditWindow.xaml.cs">
+    <Compile Update="Windows\MemberEditWindow.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="MemberListWindow.xaml.cs">
+    <Compile Update="Windows\MemberListWindow.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Page Update="BankDetailsWindow.xaml">
+    <Page Update="Windows\BankDetailsWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="MainWindow.xaml">
+    <Page Update="Windows\MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="MemberAddWindow.xaml">
+    <Page Update="Windows\MemberAddWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="MemberEditWindow.xaml">
+    <Page Update="Windows\MemberEditWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="MemberListWindow.xaml">
+    <Page Update="Windows\MemberListWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
diff --git a/WGneu/BankDetailsWindow.xaml b/WGneu/Windows/BankDetailsWindow.xaml
similarity index 96%
rename from WGneu/BankDetailsWindow.xaml
rename to WGneu/Windows/BankDetailsWindow.xaml
index 8c4b8aa..9d8ae6b 100644
--- a/WGneu/BankDetailsWindow.xaml
+++ b/WGneu/Windows/BankDetailsWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="WGneu.BankDetailsWindow"
+<Window x:Class="WGneu.Windows.BankDetailsWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WGneu"
+        xmlns:local="clr-namespace:WGneu.Windows"
         mc:Ignorable="d"
         Title="Bankverbindung" Height="295" Width="440" ResizeMode="NoResize" MinWidth="440" MinHeight="295">
     <Grid>
diff --git a/WGneu/BankDetailsWindow.xaml.cs b/WGneu/Windows/BankDetailsWindow.xaml.cs
similarity index 99%
rename from WGneu/BankDetailsWindow.xaml.cs
rename to WGneu/Windows/BankDetailsWindow.xaml.cs
index edb6849..50f4a89 100644
--- a/WGneu/BankDetailsWindow.xaml.cs
+++ b/WGneu/Windows/BankDetailsWindow.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
 using WGneu.Models;
 
 
-namespace WGneu
+namespace WGneu.Windows
 {
     /// <summary>
     /// Interaktionslogik für BankDetailsWindow.xaml
diff --git a/WGneu/MainWindow.xaml b/WGneu/Windows/MainWindow.xaml
similarity index 93%
rename from WGneu/MainWindow.xaml
rename to WGneu/Windows/MainWindow.xaml
index a8e5f98..5d9fbbc 100644
--- a/WGneu/MainWindow.xaml
+++ b/WGneu/Windows/MainWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="WGneu.MainWindow"
+<Window x:Class="WGneu.Windows.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WGneu"
+        xmlns:local="clr-namespace:WGneu.Windows"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800" ResizeMode="CanResize" SizeToContent="Manual"
         Loaded="Window_Loaded">
diff --git a/WGneu/MainWindow.xaml.cs b/WGneu/Windows/MainWindow.xaml.cs
similarity index 98%
rename from WGneu/MainWindow.xaml.cs
rename to WGneu/Windows/MainWindow.xaml.cs
index ba87803..42fe90e 100644
--- a/WGneu/MainWindow.xaml.cs
+++ b/WGneu/Windows/MainWindow.xaml.cs
@@ -18,7 +18,7 @@ using System.Windows.Shapes;
 using WGneu.Models;
 
 
-namespace WGneu
+namespace WGneu.Windows
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/WGneu/MemberAddWindow.xaml b/WGneu/Windows/MemberAddWindow.xaml
similarity index 96%
rename from WGneu/MemberAddWindow.xaml
rename to WGneu/Windows/MemberAddWindow.xaml
index 31c13a2..8c36334 100644
--- a/WGneu/MemberAddWindow.xaml
+++ b/WGneu/Windows/MemberAddWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="WGneu.MemberAddWindow"
+<Window x:Class="WGneu.Windows.MemberAddWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WGneu"
+        xmlns:local="clr-namespace:WGneu.Windows"
         mc:Ignorable="d"
         Title="Mitglied anlegen" Height="450" Width="800"
         Loaded="Window_Loaded">
diff --git a/WGneu/MemberAddWindow.xaml.cs b/WGneu/Windows/MemberAddWindow.xaml.cs
similarity index 98%
rename from WGneu/MemberAddWindow.xaml.cs
rename to WGneu/Windows/MemberAddWindow.xaml.cs
index 7e391c7..bb26971 100644
--- a/WGneu/MemberAddWindow.xaml.cs
+++ b/WGneu/Windows/MemberAddWindow.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
 using WGneu.Models;
 
 
-namespace WGneu
+namespace WGneu.Windows
 {
     /// <summary>
     /// Interaction logic for MemberAddWindow.xaml
diff --git a/WGneu/MemberEditWindow.xaml b/WGneu/Windows/MemberEditWindow.xaml
similarity index 96%
rename from WGneu/MemberEditWindow.xaml
rename to WGneu/Windows/MemberEditWindow.xaml
index 604e80c..76c2079 100644
--- a/WGneu/MemberEditWindow.xaml
+++ b/WGneu/Windows/MemberEditWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="WGneu.MemberEditWindow"
+<Window x:Class="WGneu.Windows.MemberEditWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WGneu"
+        xmlns:local="clr-namespace:WGneu.Windows"
         mc:Ignorable="d"
         Title="MemberEditWindow" Height="450" Width="800"
         Loaded="Window_Loaded">
diff --git a/WGneu/MemberEditWindow.xaml.cs b/WGneu/Windows/MemberEditWindow.xaml.cs
similarity index 98%
rename from WGneu/MemberEditWindow.xaml.cs
rename to WGneu/Windows/MemberEditWindow.xaml.cs
index 780d9b8..e67badc 100644
--- a/WGneu/MemberEditWindow.xaml.cs
+++ b/WGneu/Windows/MemberEditWindow.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Shapes;
 using WGneu.Models;
 
 
-namespace WGneu
+namespace WGneu.Windows
 {
     /// <summary>
     /// Interaction logic for MemberEditWindow.xaml
diff --git a/WGneu/MemberListWindow.xaml b/WGneu/Windows/MemberListWindow.xaml
similarity index 96%
rename from WGneu/MemberListWindow.xaml
rename to WGneu/Windows/MemberListWindow.xaml
index 9d715df..edb1de2 100644
--- a/WGneu/MemberListWindow.xaml
+++ b/WGneu/Windows/MemberListWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="WGneu.MemberListWindow"
+<Window x:Class="WGneu.Windows.MemberListWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WGneu"
+        xmlns:local="clr-namespace:WGneu.Windows"
         xmlns:ui="http://schemas.modernwpf.com/2019"
         ui:WindowHelper.UseModernWindowStyle="True"
         mc:Ignorable="d"
diff --git a/WGneu/MemberListWindow.xaml.cs b/WGneu/Windows/MemberListWindow.xaml.cs
similarity index 99%
rename from WGneu/MemberListWindow.xaml.cs
rename to WGneu/Windows/MemberListWindow.xaml.cs
index 7c75530..a2f1f0b 100644
--- a/WGneu/MemberListWindow.xaml.cs
+++ b/WGneu/Windows/MemberListWindow.xaml.cs
@@ -16,7 +16,7 @@ using System.Windows.Shapes;
 using WGneu.Models;
 
 
-namespace WGneu
+namespace WGneu.Windows
 {
     /// <summary>
     /// Interaktionslogik für Window1.xaml