diff --git a/KanSan.ViewModel/KundenEditViewModel.cs b/KanSan.ViewModel/Kunden/KundenEditViewModel.cs
similarity index 100%
rename from KanSan.ViewModel/KundenEditViewModel.cs
rename to KanSan.ViewModel/Kunden/KundenEditViewModel.cs
diff --git a/KanSan.ViewModel/KundenListViewModel.cs b/KanSan.ViewModel/Kunden/KundenListViewModel.cs
similarity index 100%
rename from KanSan.ViewModel/KundenListViewModel.cs
rename to KanSan.ViewModel/Kunden/KundenListViewModel.cs
diff --git a/KanSan.ViewModel/ProjektEditViewModel.cs b/KanSan.ViewModel/Projekt/ProjektEditViewModel.cs
similarity index 100%
rename from KanSan.ViewModel/ProjektEditViewModel.cs
rename to KanSan.ViewModel/Projekt/ProjektEditViewModel.cs
diff --git a/KanSan.ViewModel/ProjektListViewModel.cs b/KanSan.ViewModel/Projekt/ProjektListViewModel.cs
similarity index 100%
rename from KanSan.ViewModel/ProjektListViewModel.cs
rename to KanSan.ViewModel/Projekt/ProjektListViewModel.cs
diff --git a/KanSan.ViewModel/ProjektViewModel.cs b/KanSan.ViewModel/Projekt/ProjektViewModel.cs
similarity index 100%
rename from KanSan.ViewModel/ProjektViewModel.cs
rename to KanSan.ViewModel/Projekt/ProjektViewModel.cs
diff --git a/KanSan/UI/Baustelle/UCBaustelleEdit.xaml b/KanSan/UI/Baustelle/UCBaustelleEdit.xaml
new file mode 100644
index 0000000..38b230e
--- /dev/null
+++ b/KanSan/UI/Baustelle/UCBaustelleEdit.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="KanSan.UI.UCBaustelleEdit"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:KanSan.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/KanSan/UI/Baustelle/UCBaustelleEdit.xaml.cs b/KanSan/UI/Baustelle/UCBaustelleEdit.xaml.cs
new file mode 100644
index 0000000..6db6d9d
--- /dev/null
+++ b/KanSan/UI/Baustelle/UCBaustelleEdit.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+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 KanSan.UI
+{
+    /// <summary>
+    /// Interaktionslogik für UCBaustelleEdit.xaml
+    /// </summary>
+    public partial class UCBaustelleEdit : UserControl
+    {
+        public UCBaustelleEdit()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/KanSan/UI/Baustelle/UCBaustelleList.xaml b/KanSan/UI/Baustelle/UCBaustelleList.xaml
new file mode 100644
index 0000000..85605ae
--- /dev/null
+++ b/KanSan/UI/Baustelle/UCBaustelleList.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="KanSan.UI.UCBaustelleList"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:KanSan.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/KanSan/UI/Baustelle/UCBaustelleList.xaml.cs b/KanSan/UI/Baustelle/UCBaustelleList.xaml.cs
new file mode 100644
index 0000000..7d9130b
--- /dev/null
+++ b/KanSan/UI/Baustelle/UCBaustelleList.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+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 KanSan.UI
+{
+    /// <summary>
+    /// Interaktionslogik für UCBaustelleList.xaml
+    /// </summary>
+    public partial class UCBaustelleList : UserControl
+    {
+        public UCBaustelleList()
+        {
+            InitializeComponent();
+        }
+    }
+}