diff --git a/.gitignore b/.gitignore
index fc4e5bc..131987a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ project.fragment.lock.json
 *.tmp
 /DaSaSo.InMemoryProvider/obj/Debug/*
 /DaSaSo.ViewModel/version.txt
+/DaSaSo.Wpf/version.txt
diff --git a/DaSaSo.Domain/Model/PhotoDocumentation.cs b/DaSaSo.Domain/Model/PhotoDocumentation.cs
new file mode 100644
index 0000000..c72fa0d
--- /dev/null
+++ b/DaSaSo.Domain/Model/PhotoDocumentation.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.Domain.Model
+{
+    public class PhotoDocumentation : DomainObject
+    {
+        public string PicturePath { get; set; }
+        public string Description { get; set; }
+    }
+}
diff --git a/DaSaSo.EntityFramework/DaSaSoDbContext.cs b/DaSaSo.EntityFramework/DaSaSoDbContext.cs
index eca15d1..a18026d 100644
--- a/DaSaSo.EntityFramework/DaSaSoDbContext.cs
+++ b/DaSaSo.EntityFramework/DaSaSoDbContext.cs
@@ -28,6 +28,7 @@ namespace DaSaSo.EntityFramework
         public DbSet<PipeLiner>? PipeLiners { get; set; }
         public DbSet<Impregnation>? Impregnations { get; set; }
         public DbSet<SewerPoint>? SewerPoints { get; set; }
+        public DbSet<PhotoDocumentation>? PhotoDocumentation { get; set;}
 
     }
 }
diff --git a/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.Designer.cs b/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.Designer.cs
new file mode 100644
index 0000000..1edaa19
--- /dev/null
+++ b/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.Designer.cs
@@ -0,0 +1,405 @@
+// <auto-generated />
+using System;
+using DaSaSo.EntityFramework;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DaSaSo.EntityFramework.Migrations
+{
+    [DbContext(typeof(DaSaSoDbContext))]
+    [Migration("20220330120614_PhotoDocumentation_Added")]
+    partial class PhotoDocumentation_Added
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("BuildingSiteNumber")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ProjectId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("Buildingsites");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Postcode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Impregnation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DN")
+                        .HasColumnType("integer");
+
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date");
+
+                    b.Property<bool>("IsAvaible")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LinerNumber")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("Linerlength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("WallThickness")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Impregnations");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.PhotoDocumentation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PicturePath")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PhotoDocumentation");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("ClosedEnd")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date");
+
+                    b.Property<int?>("ImpregnationId")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("InversionPressure")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("LinerLength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Operator")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Preliner")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("PreparationType")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("TemperaturAssembly")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperaturStorage")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperatureOutdoors")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperatureSewer")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Weather")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImpregnationId");
+
+                    b.ToTable("PipeLiners");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Projektnummer")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DamageType")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("Distance")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("SewerObjectId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SewerObjectId");
+
+                    b.ToTable("SewerDamages");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int?>("BuildingSiteId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("BuildingsiteBarier")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("DN")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Hausnummer")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Material")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ObjektName")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PermitNeeded")
+                        .HasColumnType("boolean");
+
+                    b.Property<int?>("PipeLinerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PunktObenId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PunktObenType")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PunktUntenId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PunktUntenType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SanNummer")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("SewerActivated")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("SewerCleaned")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal>("SewerLength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("StreetName")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("WaterBarrier")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingSiteId");
+
+                    b.HasIndex("PipeLinerId");
+
+                    b.HasIndex("PunktObenId");
+
+                    b.HasIndex("PunktUntenId");
+
+                    b.ToTable("SewerObjects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerPoint", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Objektnummer")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SewerPoints");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("DaSaSo.Domain.Model.Project", "Project")
+                        .WithMany("BuildingSites")
+                        .HasForeignKey("ProjectId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Project");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Impregnation", "Impregnation")
+                        .WithMany()
+                        .HasForeignKey("ImpregnationId");
+
+                    b.Navigation("Impregnation");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
+                        .WithMany("SewerDamages")
+                        .HasForeignKey("SewerObjectId");
+
+                    b.Navigation("SewerObject");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
+                        .WithMany("SewerObjects")
+                        .HasForeignKey("BuildingSiteId");
+
+                    b.HasOne("DaSaSo.Domain.Model.PipeLiner", "PipeLiner")
+                        .WithMany()
+                        .HasForeignKey("PipeLinerId");
+
+                    b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktOben")
+                        .WithMany()
+                        .HasForeignKey("PunktObenId");
+
+                    b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktUnten")
+                        .WithMany()
+                        .HasForeignKey("PunktUntenId");
+
+                    b.Navigation("BuildingSite");
+
+                    b.Navigation("PipeLiner");
+
+                    b.Navigation("PunktOben");
+
+                    b.Navigation("PunktUnten");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.Navigation("SewerObjects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
+                {
+                    b.Navigation("BuildingSites");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.Navigation("SewerDamages");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.cs b/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.cs
new file mode 100644
index 0000000..c766acf
--- /dev/null
+++ b/DaSaSo.EntityFramework/Migrations/20220330120614_PhotoDocumentation_Added.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DaSaSo.EntityFramework.Migrations
+{
+    public partial class PhotoDocumentation_Added : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "PhotoDocumentation",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    PicturePath = table.Column<string>(type: "text", nullable: true),
+                    Description = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PhotoDocumentation", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "PhotoDocumentation");
+        }
+    }
+}
diff --git a/DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs b/DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs
index dee3080..cc0fa9d 100644
--- a/DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs
+++ b/DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace DaSaSo.EntityFramework.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10")
+                .HasAnnotation("ProductVersion", "6.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -116,6 +116,25 @@ namespace DaSaSo.EntityFramework.Migrations
                     b.ToTable("Impregnations");
                 });
 
+            modelBuilder.Entity("DaSaSo.Domain.Model.PhotoDocumentation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PicturePath")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PhotoDocumentation");
+                });
+
             modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
                 {
                     b.Property<int>("Id")
diff --git a/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj b/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj
index e3ec143..72258e3 100644
--- a/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj
+++ b/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj
@@ -5,18 +5,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="version.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="version.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DaSaSo.ViewModel/SewerPictureDocumentationViewModel.cs b/DaSaSo.ViewModel/SewerPictureDocumentationViewModel.cs
deleted file mode 100644
index 4114468..0000000
--- a/DaSaSo.ViewModel/SewerPictureDocumentationViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DaSaSo.ViewModel
-{
-    public class SewerPictureDocumentationViewModel : BaseViewModel
-    {
-    }
-}
diff --git a/DaSaSo.Wpf/App.xaml.cs b/DaSaSo.Wpf/App.xaml.cs
index e660e14..5505667 100644
--- a/DaSaSo.Wpf/App.xaml.cs
+++ b/DaSaSo.Wpf/App.xaml.cs
@@ -5,11 +5,11 @@ using DaSaSo.Domain.Services.ProjectServices;
 using DaSaSo.Domain.Services.SewerObjectService;
 using DaSaSo.EntityFramework;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel;
-using DaSaSo.ViewModel.Factories;
-using DaSaSo.ViewModel.Interface;
-using DaSaSo.ViewModel.State.ActualState;
-using DaSaSo.ViewModel.State.Navigation;
+using DaSaSo.Wpf.ViewModel;
+using DaSaSo.Wpf.ViewModel.Factories;
+using DaSaSo.Wpf.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.State.ActualState;
+using DaSaSo.Wpf.ViewModel.State.Navigation;
 using DaSaSo.Wpf.HostBuilders;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
diff --git a/DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml b/DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml
index fed2d8c..e1115cb 100644
--- a/DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml
+++ b/DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml
@@ -5,10 +5,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DaSaSo.Wpf.Controls"
              xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain"
-             xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
+             xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
              
              xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
-             d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
+             
              mc:Ignorable="d" 
              d:DesignHeight="375" d:DesignWidth="200">
     <UserControl.Resources>
diff --git a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
index 38c02bd..b27b5e2 100644
--- a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
+++ b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain"
-             xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="647.5" d:DesignWidth="200">
     <Grid>
diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj b/DaSaSo.Wpf/DaSaSo.Wpf.csproj
index 6cff904..4e14e91 100644
--- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj
+++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj
@@ -7,17 +7,29 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="version.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="version.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
-    <ProjectReference Include="..\DaSaSo.ViewModel\DaSaSo.ViewModel.csproj" />
+    <ProjectReference Include="..\DaSaSo.EntityFramework\DaSaSo.EntityFramework.csproj" />
+    <ProjectReference Include="..\DaSaSo.InMemoryProvider\DaSaSo.InMemoryProvider.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,4 +38,8 @@
     </None>
   </ItemGroup>
 
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="git rev-parse HEAD &gt; $(ProjectDir)\version.txt" />
+  </Target>
+
 </Project>
diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
index 8e7f7c6..d51b02b 100644
--- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
+++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
@@ -52,6 +52,9 @@
     <Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="View\SewerObject\PhotodocumentationView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\SewerObject\SewerPipeLinerView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -120,6 +123,9 @@
     <Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="View\SewerObject\PhotodocumentationView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\SewerObject\SewerPipeLinerView.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/DaSaSo.Wpf/HostBuilders/AddStoresHostBuilderExtensions.cs b/DaSaSo.Wpf/HostBuilders/AddStoresHostBuilderExtensions.cs
index f3160c6..62242fb 100644
--- a/DaSaSo.Wpf/HostBuilders/AddStoresHostBuilderExtensions.cs
+++ b/DaSaSo.Wpf/HostBuilders/AddStoresHostBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using DaSaSo.ViewModel.Interface;
-using DaSaSo.ViewModel.State.ActualState;
-using DaSaSo.ViewModel.State.Navigation;
+using DaSaSo.Wpf.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.State.ActualState;
+using DaSaSo.Wpf.ViewModel.State.Navigation;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
diff --git a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
index 424fd39..963f809 100644
--- a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
+++ b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
@@ -4,10 +4,10 @@ using DaSaSo.Domain.Services.BuildingsiteServices;
 using DaSaSo.Domain.Services.ProjectServices;
 using DaSaSo.Domain.Services.SewerObjectService;
 using DaSaSo.Domain.Services.SewerPointServices;
-using DaSaSo.ViewModel;
-using DaSaSo.ViewModel.Factories;
-using DaSaSo.ViewModel.Interface;
-using DaSaSo.ViewModel.State.Navigation;
+using DaSaSo.Wpf.ViewModel;
+using DaSaSo.Wpf.ViewModel.Factories;
+using DaSaSo.Wpf.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.State.Navigation;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
diff --git a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteEditView.xaml b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteEditView.xaml
index 8015c81..2caec95 100644
--- a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteEditView.xaml
+++ b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteEditView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteEditViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteEditViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
index 349af49..dece294 100644
--- a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
+++ b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteListViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteListViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Client/ClientEditView.xaml b/DaSaSo.Wpf/View/Client/ClientEditView.xaml
index 79ec6a8..153f912 100644
--- a/DaSaSo.Wpf/View/Client/ClientEditView.xaml
+++ b/DaSaSo.Wpf/View/Client/ClientEditView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientEditViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientEditViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Client/ClientListView.xaml b/DaSaSo.Wpf/View/Client/ClientListView.xaml
index ec6a56c..cfb4b48 100644
--- a/DaSaSo.Wpf/View/Client/ClientListView.xaml
+++ b/DaSaSo.Wpf/View/Client/ClientListView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientListViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientListViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
diff --git a/DaSaSo.Wpf/View/HomeView.xaml b/DaSaSo.Wpf/View/HomeView.xaml
index 7f72c16..18735e6 100644
--- a/DaSaSo.Wpf/View/HomeView.xaml
+++ b/DaSaSo.Wpf/View/HomeView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:HomeViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml b/DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
index 169f951..53947e5 100644
--- a/DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
+++ b/DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml b/DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
index 0ebca94..aaf8eee 100644
--- a/DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
+++ b/DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
diff --git a/DaSaSo.Wpf/View/Project/ProjectEditView.xaml b/DaSaSo.Wpf/View/Project/ProjectEditView.xaml
index b3193e4..4a91636 100644
--- a/DaSaSo.Wpf/View/Project/ProjectEditView.xaml
+++ b/DaSaSo.Wpf/View/Project/ProjectEditView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectEditViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectEditViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/Project/ProjectListView.xaml b/DaSaSo.Wpf/View/Project/ProjectListView.xaml
index c3e50ef..b655e72 100644
--- a/DaSaSo.Wpf/View/Project/ProjectListView.xaml
+++ b/DaSaSo.Wpf/View/Project/ProjectListView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectListViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectListViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
index e7ccc56..8763466 100644
--- a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:damagetype="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
-             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerDamageControllViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.Wpf.ViewModel.Controls" d:DataContext="{d:DesignInstance Type=controls:SewerDamageControllViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="LightBlue">
diff --git a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
index 636cc0b..d8a57ad 100644
--- a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerPreperationControllViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.Wpf.ViewModel.Controls" d:DataContext="{d:DesignInstance Type=controls:SewerPreperationControllViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="LightBlue">
diff --git a/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml b/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
index 1bae6b4..320e441 100644
--- a/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" xmlns:controls="clr-namespace:DaSaSo.Wpf.ViewModel.Controls" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml b/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml
new file mode 100644
index 0000000..de08153
--- /dev/null
+++ b/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.PhotodocumentationView"
+             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:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPictureDocumentationViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="9*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="60" />
+            <ColumnDefinition Width="300" />
+        </Grid.ColumnDefinitions>
+        <TabControl ItemsSource="{Binding Tabs}" Name="tabImages" Grid.Column="1" Background="#00FFFFFF" TabStripPlacement="Bottom" MinHeight="150" AllowDrop="False" Focusable="False" TextOptions.TextFormattingMode="Display">
+            <TabControl.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Header}" />
+                </DataTemplate>
+            </TabControl.ItemTemplate>
+        </TabControl>
+        <TextBlock Name="txtBemerkung" Grid.Column="1" Grid.Row="1" TextWrapping="Wrap" Background="#FFFFFFFF" Foreground="#FF000000" VerticalAlignment="Center" Text="Kommentar" />
+        <Button Name="btnAddPhoto" Content="Hinzufügen" Width="50" Grid.RowSpan="2" VerticalAlignment="Top" />
+    </Grid>
+</UserControl>
diff --git a/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml.cs b/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml.cs
new file mode 100644
index 0000000..bc17dbd
--- /dev/null
+++ b/DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml.cs
@@ -0,0 +1,28 @@
+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 DaSaSo.Wpf.View.SewerObject
+{
+    /// <summary>
+    /// Interaction logic for PhotodocumentationView.xaml
+    /// </summary>
+    public partial class PhotodocumentationView : UserControl
+    {
+        public PhotodocumentationView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
index cf62f66..d176dc3 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:selfControls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
-             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageEditViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageEditViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml
index 67dd17d..8b05590 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:sd="clr-namespace:DaSaSo.Wpf.Sampledata"
              xmlns:damagetype ="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
-             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
              xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
     mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="1020">
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
index ec1603e..23120c0 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
@@ -3,11 +3,11 @@
              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:viewModel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
-             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
+             xmlns:viewModel="clr-namespace:DaSaSo.Wpf.ViewModel"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
              mc:Ignorable="d" 
              xmlns:views ="clr-namespace:DaSaSo.Wpf.View.SewerObject"
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="900" d:DesignWidth="800">
     <UserControl.Resources>
         <DataTemplate DataType="{x:Type viewmodel:SewerStammdatenViewModel}">
             <views:SewerStammdatenView />
@@ -21,6 +21,9 @@
         <DataTemplate DataType="{x:Type viewmodel:SewerPipeLinerViewModel}">
             <views:SewerPipeLinerView />
         </DataTemplate>
+        <DataTemplate DataType="{x:Type viewmodel:SewerPictureDocumentationViewModel}">
+            <views:PhotodocumentationView />
+        </DataTemplate>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
     <Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
index 5c5e946..319df52 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject"
-             xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
+             xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
              mc:Ignorable="d" d:DesignWidth="800" Height="722">
     <Grid>
         <Grid.RowDefinitions>
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml
index d8700a2..8e7736d 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml
@@ -3,7 +3,7 @@
              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:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerStammdatenViewModel}"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerStammdatenViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/DaSaSo.ViewModel/BaseViewModel.cs b/DaSaSo.Wpf/ViewModel/BaseViewModel.cs
similarity index 85%
rename from DaSaSo.ViewModel/BaseViewModel.cs
rename to DaSaSo.Wpf/ViewModel/BaseViewModel.cs
index 72fe860..76dcd60 100644
--- a/DaSaSo.ViewModel/BaseViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/BaseViewModel.cs
@@ -1,4 +1,5 @@
-namespace DaSaSo.ViewModel
+
+namespace DaSaSo.Wpf.ViewModel
 {
     public delegate TViewModel CreateViewModel<TViewModel>() where TViewModel : BaseViewModel;
     public class BaseViewModel : ObservableObject
diff --git a/DaSaSo.ViewModel/BuildingsiteEditViewModel.cs b/DaSaSo.Wpf/ViewModel/BuildingsiteEditViewModel.cs
similarity index 97%
rename from DaSaSo.ViewModel/BuildingsiteEditViewModel.cs
rename to DaSaSo.Wpf/ViewModel/BuildingsiteEditViewModel.cs
index 9df31e2..6b284da 100644
--- a/DaSaSo.ViewModel/BuildingsiteEditViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/BuildingsiteEditViewModel.cs
@@ -1,7 +1,7 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.BuildingsiteServices;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class BuildingsiteEditViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/BuildingsiteListViewModel.cs b/DaSaSo.Wpf/ViewModel/BuildingsiteListViewModel.cs
similarity index 96%
rename from DaSaSo.ViewModel/BuildingsiteListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/BuildingsiteListViewModel.cs
index bc78f61..26aff5a 100644
--- a/DaSaSo.ViewModel/BuildingsiteListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/BuildingsiteListViewModel.cs
@@ -2,8 +2,8 @@
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.BuildingsiteServices;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -12,7 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class BuildingsiteListViewModel: BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/ClientEditViewModel.cs b/DaSaSo.Wpf/ViewModel/ClientEditViewModel.cs
similarity index 94%
rename from DaSaSo.ViewModel/ClientEditViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ClientEditViewModel.cs
index b266cd3..e1c7147 100644
--- a/DaSaSo.ViewModel/ClientEditViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ClientEditViewModel.cs
@@ -1,6 +1,6 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ClientEditViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/ClientListViewModel.cs b/DaSaSo.Wpf/ViewModel/ClientListViewModel.cs
similarity index 94%
rename from DaSaSo.ViewModel/ClientListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ClientListViewModel.cs
index 34212c3..a3e169e 100644
--- a/DaSaSo.ViewModel/ClientListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ClientListViewModel.cs
@@ -1,8 +1,8 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Enums;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Enums;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ClientListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Commands/AddBuildingsiteCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddBuildingsiteCommand.cs
similarity index 87%
rename from DaSaSo.ViewModel/Commands/AddBuildingsiteCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddBuildingsiteCommand.cs
index a1408bc..5753c0f 100644
--- a/DaSaSo.ViewModel/Commands/AddBuildingsiteCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddBuildingsiteCommand.cs
@@ -1,14 +1,10 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.BuildingsiteServices;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class AddBuildingsiteCommand: AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AddClientCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddClientCommand.cs
similarity index 87%
rename from DaSaSo.ViewModel/Commands/AddClientCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddClientCommand.cs
index b1cfab5..c3ca5c7 100644
--- a/DaSaSo.ViewModel/Commands/AddClientCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddClientCommand.cs
@@ -1,13 +1,9 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class AddClientCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AddDamageCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddDamageCommand.cs
similarity index 87%
rename from DaSaSo.ViewModel/Commands/AddDamageCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddDamageCommand.cs
index 99e6ed3..ff6ccfd 100644
--- a/DaSaSo.ViewModel/Commands/AddDamageCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddDamageCommand.cs
@@ -1,13 +1,9 @@
 using DaSaSo.Domain.Model;
-using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class AddDamageCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddImpregnationCommand.cs
similarity index 82%
rename from DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddImpregnationCommand.cs
index 8ee2fd4..77f64a7 100644
--- a/DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddImpregnationCommand.cs
@@ -1,13 +1,10 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     internal class AddImpregnationCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AddProjectCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddProjectCommand.cs
similarity index 87%
rename from DaSaSo.ViewModel/Commands/AddProjectCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddProjectCommand.cs
index ed4d371..a210010 100644
--- a/DaSaSo.ViewModel/Commands/AddProjectCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddProjectCommand.cs
@@ -1,14 +1,10 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.ProjectServices;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class AddProjectCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AddSewerObjectCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/AddSewerObjectCommand.cs
similarity index 83%
rename from DaSaSo.ViewModel/Commands/AddSewerObjectCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AddSewerObjectCommand.cs
index 1b0eac9..465ac86 100644
--- a/DaSaSo.ViewModel/Commands/AddSewerObjectCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AddSewerObjectCommand.cs
@@ -1,13 +1,9 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services.SewerObjectService;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class AddSewerObjectCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/AsyncCommandBase.cs b/DaSaSo.Wpf/ViewModel/Commands/AsyncCommandBase.cs
similarity index 96%
rename from DaSaSo.ViewModel/Commands/AsyncCommandBase.cs
rename to DaSaSo.Wpf/ViewModel/Commands/AsyncCommandBase.cs
index 4a26eb2..fe41012 100644
--- a/DaSaSo.ViewModel/Commands/AsyncCommandBase.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/AsyncCommandBase.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public abstract class AsyncCommandBase : ICommand
     {
diff --git a/DaSaSo.ViewModel/Commands/EditBuildingsiteCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/EditBuildingsiteCommand.cs
similarity index 92%
rename from DaSaSo.ViewModel/Commands/EditBuildingsiteCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/EditBuildingsiteCommand.cs
index 610e0a3..10d0cac 100644
--- a/DaSaSo.ViewModel/Commands/EditBuildingsiteCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/EditBuildingsiteCommand.cs
@@ -1,15 +1,11 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.BuildingsiteServices;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class EditBuildingsiteCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/EditClientCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/EditClientCommand.cs
similarity index 87%
rename from DaSaSo.ViewModel/Commands/EditClientCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/EditClientCommand.cs
index 9f7e7e2..93fcd00 100644
--- a/DaSaSo.ViewModel/Commands/EditClientCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/EditClientCommand.cs
@@ -1,16 +1,10 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class EditClientCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/EditImpregnationCommand.cs
similarity index 90%
rename from DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/EditImpregnationCommand.cs
index 37e7e75..b0dc5eb 100644
--- a/DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/EditImpregnationCommand.cs
@@ -1,14 +1,9 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     internal class EditImpregnationCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/EditProjectCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/EditProjectCommand.cs
similarity index 91%
rename from DaSaSo.ViewModel/Commands/EditProjectCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/EditProjectCommand.cs
index 2d7a143..41708d8 100644
--- a/DaSaSo.ViewModel/Commands/EditProjectCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/EditProjectCommand.cs
@@ -1,15 +1,11 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.ProjectServices;
-using DaSaSo.ViewModel.Interface;
-using System;
-using System.Collections.Generic;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class EditProjectCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SaveImpregnationCommand.cs
similarity index 96%
rename from DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SaveImpregnationCommand.cs
index 0064071..efdc82c 100644
--- a/DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SaveImpregnationCommand.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     internal class SaveImpregnationCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SaveSewerCommand.cs
similarity index 94%
rename from DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SaveSewerCommand.cs
index 88b6d1d..89dc747 100644
--- a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SaveSewerCommand.cs
@@ -2,7 +2,7 @@
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.SewerObjectService;
 using DaSaSo.Domain.Services.SewerPointServices;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class SaveSewerCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SaveSewerStammdatenCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SaveSewerStammdatenCommand.cs
similarity index 98%
rename from DaSaSo.ViewModel/Commands/SaveSewerStammdatenCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SaveSewerStammdatenCommand.cs
index 9c43d01..4feaac1 100644
--- a/DaSaSo.ViewModel/Commands/SaveSewerStammdatenCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SaveSewerStammdatenCommand.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class SaveSewerStammdatenCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SelectBuildingsiteCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SelectBuildingsiteCommand.cs
similarity index 94%
rename from DaSaSo.ViewModel/Commands/SelectBuildingsiteCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SelectBuildingsiteCommand.cs
index cff5521..d3841ce 100644
--- a/DaSaSo.ViewModel/Commands/SelectBuildingsiteCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SelectBuildingsiteCommand.cs
@@ -1,4 +1,4 @@
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class SelectBuildingsiteCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SelectClientCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SelectClientCommand.cs
similarity index 95%
rename from DaSaSo.ViewModel/Commands/SelectClientCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SelectClientCommand.cs
index 0e3e160..6f83df8 100644
--- a/DaSaSo.ViewModel/Commands/SelectClientCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SelectClientCommand.cs
@@ -1,6 +1,6 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class SelectClientCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SelectDamageCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SelectDamageCommand.cs
similarity index 93%
rename from DaSaSo.ViewModel/Commands/SelectDamageCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SelectDamageCommand.cs
index 6e275b9..3b52263 100644
--- a/DaSaSo.ViewModel/Commands/SelectDamageCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SelectDamageCommand.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class SelectDamageCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SelectProjectCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SelectProjectCommand.cs
similarity index 93%
rename from DaSaSo.ViewModel/Commands/SelectProjectCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SelectProjectCommand.cs
index 748f2dc..4a8728f 100644
--- a/DaSaSo.ViewModel/Commands/SelectProjectCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SelectProjectCommand.cs
@@ -1,4 +1,4 @@
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class SelectProjectCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/SelectSewerObjectCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/SelectSewerObjectCommand.cs
similarity index 91%
rename from DaSaSo.ViewModel/Commands/SelectSewerObjectCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/SelectSewerObjectCommand.cs
index 8633737..18bc06a 100644
--- a/DaSaSo.ViewModel/Commands/SelectSewerObjectCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/SelectSewerObjectCommand.cs
@@ -1,12 +1,12 @@
 using DaSaSo.Domain.Model;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     public class SelectSewerObjectCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
similarity index 92%
rename from DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
index bd050d3..963f127 100644
--- a/DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
@@ -1,12 +1,12 @@
 using DaSaSo.Domain.Enums;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class UpdateCurrentSewerViewModelCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs b/DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentViewModelCommand.cs
similarity index 88%
rename from DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs
rename to DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentViewModelCommand.cs
index aae6ea7..670e5c9 100644
--- a/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs
+++ b/DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentViewModelCommand.cs
@@ -1,11 +1,11 @@
 using DaSaSo.Domain.Enums;
-using DaSaSo.ViewModel.Enums;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Enums;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.Commands
+namespace DaSaSo.Wpf.ViewModel.Commands
 {
     class UpdateCurrentViewModelCommand : AsyncCommandBase
     {
diff --git a/DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs b/DaSaSo.Wpf/ViewModel/Controls/SewerDamageControllViewModel.cs
similarity index 97%
rename from DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs
rename to DaSaSo.Wpf/ViewModel/Controls/SewerDamageControllViewModel.cs
index fc09bc3..2105fde 100644
--- a/DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/Controls/SewerDamageControllViewModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Controls
+namespace DaSaSo.Wpf.ViewModel.Controls
 {
     public class SewerDamageControllViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Controls/SewerPreperationControllViewModel.cs b/DaSaSo.Wpf/ViewModel/Controls/SewerPreperationControllViewModel.cs
similarity index 97%
rename from DaSaSo.ViewModel/Controls/SewerPreperationControllViewModel.cs
rename to DaSaSo.Wpf/ViewModel/Controls/SewerPreperationControllViewModel.cs
index e365944..50229c0 100644
--- a/DaSaSo.ViewModel/Controls/SewerPreperationControllViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/Controls/SewerPreperationControllViewModel.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Controls
+namespace DaSaSo.Wpf.ViewModel.Controls
 {
     public class SewerPreperationControllViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs b/DaSaSo.Wpf/ViewModel/Controls/SewerRhebalationControllViewModel.cs
similarity index 98%
rename from DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs
rename to DaSaSo.Wpf/ViewModel/Controls/SewerRhebalationControllViewModel.cs
index 97300e4..695e076 100644
--- a/DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/Controls/SewerRhebalationControllViewModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Controls
+namespace DaSaSo.Wpf.ViewModel.Controls
 {
     public class SewerRhebalationControllViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Enums/EMediator.cs b/DaSaSo.Wpf/ViewModel/Enums/EMediator.cs
similarity index 88%
rename from DaSaSo.ViewModel/Enums/EMediator.cs
rename to DaSaSo.Wpf/ViewModel/Enums/EMediator.cs
index 891443a..f0568e9 100644
--- a/DaSaSo.ViewModel/Enums/EMediator.cs
+++ b/DaSaSo.Wpf/ViewModel/Enums/EMediator.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Enums
+namespace DaSaSo.Wpf.ViewModel.Enums
 {
     
     enum EMediator
diff --git a/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs b/DaSaSo.Wpf/ViewModel/Factories/MainWindowViewModelFactory.cs
similarity index 97%
rename from DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs
rename to DaSaSo.Wpf/ViewModel/Factories/MainWindowViewModelFactory.cs
index 2585635..1438147 100644
--- a/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs
+++ b/DaSaSo.Wpf/ViewModel/Factories/MainWindowViewModelFactory.cs
@@ -1,8 +1,8 @@
 using DaSaSo.Domain.Enums;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 
-namespace DaSaSo.ViewModel.Factories
+namespace DaSaSo.Wpf.ViewModel.Factories
 {
     public class MainWindowViewModelFactory : IViewModelAbstractFactory
     {
diff --git a/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs b/DaSaSo.Wpf/ViewModel/Factories/SewerWindowViewModelFactory.cs
similarity index 96%
rename from DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
rename to DaSaSo.Wpf/ViewModel/Factories/SewerWindowViewModelFactory.cs
index 2ed582f..dcab90b 100644
--- a/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
+++ b/DaSaSo.Wpf/ViewModel/Factories/SewerWindowViewModelFactory.cs
@@ -1,12 +1,12 @@
 using DaSaSo.Domain.Enums;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Factories
+namespace DaSaSo.Wpf.ViewModel.Factories
 {
     public class SewerWindowViewModelFactory : IViewModelSewerMainFactory
     {
diff --git a/DaSaSo.ViewModel/HomeViewModel.cs b/DaSaSo.Wpf/ViewModel/HomeViewModel.cs
similarity index 88%
rename from DaSaSo.ViewModel/HomeViewModel.cs
rename to DaSaSo.Wpf/ViewModel/HomeViewModel.cs
index e1573d8..323bff1 100644
--- a/DaSaSo.ViewModel/HomeViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/HomeViewModel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class HomeViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/ImpregnierungEditViewModel.cs b/DaSaSo.Wpf/ViewModel/ImpregnierungEditViewModel.cs
similarity index 93%
rename from DaSaSo.ViewModel/ImpregnierungEditViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ImpregnierungEditViewModel.cs
index eb2877a..3e6b6c5 100644
--- a/DaSaSo.ViewModel/ImpregnierungEditViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ImpregnierungEditViewModel.cs
@@ -1,7 +1,7 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ImpregnierungEditViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/ImpregnierungListViewModel.cs b/DaSaSo.Wpf/ViewModel/ImpregnierungListViewModel.cs
similarity index 96%
rename from DaSaSo.ViewModel/ImpregnierungListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ImpregnierungListViewModel.cs
index 79cc5af..ff1b591 100644
--- a/DaSaSo.ViewModel/ImpregnierungListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ImpregnierungListViewModel.cs
@@ -1,7 +1,7 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ImpregnierungListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Interface/IActualProject.cs b/DaSaSo.Wpf/ViewModel/Interface/IActualProject.cs
similarity index 96%
rename from DaSaSo.ViewModel/Interface/IActualProject.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IActualProject.cs
index a191fb9..17ec673 100644
--- a/DaSaSo.ViewModel/Interface/IActualProject.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IActualProject.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IActualProject
     {
diff --git a/DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs b/DaSaSo.Wpf/ViewModel/Interface/IMainWindowNavigator.cs
similarity index 82%
rename from DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IMainWindowNavigator.cs
index 96d3d10..25bd2b4 100644
--- a/DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IMainWindowNavigator.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IMainWindowNavigator : INavigator
     {
diff --git a/DaSaSo.ViewModel/Interface/INavigator.cs b/DaSaSo.Wpf/ViewModel/Interface/INavigator.cs
similarity index 87%
rename from DaSaSo.ViewModel/Interface/INavigator.cs
rename to DaSaSo.Wpf/ViewModel/Interface/INavigator.cs
index d17b6c6..a236249 100644
--- a/DaSaSo.ViewModel/Interface/INavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/INavigator.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface INavigator
     {
diff --git a/DaSaSo.ViewModel/Interface/IRenavigator.cs b/DaSaSo.Wpf/ViewModel/Interface/IRenavigator.cs
similarity index 82%
rename from DaSaSo.ViewModel/Interface/IRenavigator.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IRenavigator.cs
index b744d9a..8965650 100644
--- a/DaSaSo.ViewModel/Interface/IRenavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IRenavigator.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IRenavigator
     {
diff --git a/DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs b/DaSaSo.Wpf/ViewModel/Interface/ISewerMainNavigator.cs
similarity index 82%
rename from DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs
rename to DaSaSo.Wpf/ViewModel/Interface/ISewerMainNavigator.cs
index 87c5d7f..7e4ef78 100644
--- a/DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/ISewerMainNavigator.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface ISewerMainNavigator : INavigator
     {
diff --git a/DaSaSo.ViewModel/Interface/IViewModelAbstractFactory.cs b/DaSaSo.Wpf/ViewModel/Interface/IViewModelAbstractFactory.cs
similarity index 79%
rename from DaSaSo.ViewModel/Interface/IViewModelAbstractFactory.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IViewModelAbstractFactory.cs
index 872af65..5367a20 100644
--- a/DaSaSo.ViewModel/Interface/IViewModelAbstractFactory.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IViewModelAbstractFactory.cs
@@ -1,6 +1,6 @@
 using DaSaSo.Domain.Enums;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IViewModelAbstractFactory
     {
diff --git a/DaSaSo.ViewModel/Interface/IViewModelFactory.cs b/DaSaSo.Wpf/ViewModel/Interface/IViewModelFactory.cs
similarity index 84%
rename from DaSaSo.ViewModel/Interface/IViewModelFactory.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IViewModelFactory.cs
index e359657..3327111 100644
--- a/DaSaSo.ViewModel/Interface/IViewModelFactory.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IViewModelFactory.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IViewModelFactory<T> where T: BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs b/DaSaSo.Wpf/ViewModel/Interface/IViewModelSewerMainFactory.cs
similarity index 87%
rename from DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IViewModelSewerMainFactory.cs
index c0de81b..252a8ec 100644
--- a/DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IViewModelSewerMainFactory.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public  interface IViewModelSewerMainFactory
     {
diff --git a/DaSaSo.ViewModel/Interface/IWindowService.cs b/DaSaSo.Wpf/ViewModel/Interface/IWindowService.cs
similarity index 84%
rename from DaSaSo.ViewModel/Interface/IWindowService.cs
rename to DaSaSo.Wpf/ViewModel/Interface/IWindowService.cs
index 128943d..b6059f2 100644
--- a/DaSaSo.ViewModel/Interface/IWindowService.cs
+++ b/DaSaSo.Wpf/ViewModel/Interface/IWindowService.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.Interface
+namespace DaSaSo.Wpf.ViewModel.Interface
 {
     public interface IWindowService
     {
diff --git a/DaSaSo.ViewModel/Mediator.cs b/DaSaSo.Wpf/ViewModel/Mediator.cs
similarity index 95%
rename from DaSaSo.ViewModel/Mediator.cs
rename to DaSaSo.Wpf/ViewModel/Mediator.cs
index 167f888..da931f7 100644
--- a/DaSaSo.ViewModel/Mediator.cs
+++ b/DaSaSo.Wpf/ViewModel/Mediator.cs
@@ -1,11 +1,11 @@
-using DaSaSo.ViewModel.Enums;
+using DaSaSo.Wpf.ViewModel.Enums;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     class Mediator
     {
diff --git a/DaSaSo.ViewModel/ObservableObject.cs b/DaSaSo.Wpf/ViewModel/ObservableObject.cs
similarity index 94%
rename from DaSaSo.ViewModel/ObservableObject.cs
rename to DaSaSo.Wpf/ViewModel/ObservableObject.cs
index 97a507b..1403eb4 100644
--- a/DaSaSo.ViewModel/ObservableObject.cs
+++ b/DaSaSo.Wpf/ViewModel/ObservableObject.cs
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ObservableObject : INotifyPropertyChanged
     {
diff --git a/DaSaSo.ViewModel/ProjectEditViewModel.cs b/DaSaSo.Wpf/ViewModel/ProjectEditViewModel.cs
similarity index 94%
rename from DaSaSo.ViewModel/ProjectEditViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ProjectEditViewModel.cs
index bb6fe7e..c334056 100644
--- a/DaSaSo.ViewModel/ProjectEditViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ProjectEditViewModel.cs
@@ -1,8 +1,8 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.ProjectServices;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ProjectEditViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/ProjectListViewModel.cs b/DaSaSo.Wpf/ViewModel/ProjectListViewModel.cs
similarity index 95%
rename from DaSaSo.ViewModel/ProjectListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/ProjectListViewModel.cs
index 1d20ea8..753975c 100644
--- a/DaSaSo.ViewModel/ProjectListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/ProjectListViewModel.cs
@@ -2,8 +2,8 @@
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.ProjectServices;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,7 +13,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class ProjectListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/SewerDamageEditViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerDamageEditViewModel.cs
similarity index 96%
rename from DaSaSo.ViewModel/SewerDamageEditViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerDamageEditViewModel.cs
index 6204d28..6f753fd 100644
--- a/DaSaSo.ViewModel/SewerDamageEditViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerDamageEditViewModel.cs
@@ -1,6 +1,6 @@
 using DaSaSo.Domain.Model;
-using DaSaSo.ViewModel.Controls;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Controls;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerDamageEditViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/SewerDamageListViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerDamageListViewModel.cs
similarity index 92%
rename from DaSaSo.ViewModel/SewerDamageListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerDamageListViewModel.cs
index 847654e..44ec6e2 100644
--- a/DaSaSo.ViewModel/SewerDamageListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerDamageListViewModel.cs
@@ -1,7 +1,7 @@
 using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerDamageListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/SewerMainListViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerMainListViewModel.cs
similarity index 97%
rename from DaSaSo.ViewModel/SewerMainListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerMainListViewModel.cs
index b170014..e5c3d49 100644
--- a/DaSaSo.ViewModel/SewerMainListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerMainListViewModel.cs
@@ -3,8 +3,8 @@ using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.SewerObjectService;
 using DaSaSo.Domain.Services.SewerPointServices;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerMainListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/SewerObjectListViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerObjectListViewModel.cs
similarity index 96%
rename from DaSaSo.ViewModel/SewerObjectListViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerObjectListViewModel.cs
index fc6dae9..a4838ec 100644
--- a/DaSaSo.ViewModel/SewerObjectListViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerObjectListViewModel.cs
@@ -4,8 +4,8 @@ using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.SewerObjectService;
 using DaSaSo.EntityFramework.Services;
 using DaSaSo.InMemoryProvider;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerObjectListViewModel : BaseViewModel
     {
diff --git a/DaSaSo.Wpf/ViewModel/SewerPictureDocumentationViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerPictureDocumentationViewModel.cs
new file mode 100644
index 0000000..c2b77b1
--- /dev/null
+++ b/DaSaSo.Wpf/ViewModel/SewerPictureDocumentationViewModel.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.Wpf.ViewModel
+{
+    public static class BitmapConversion
+    {
+      //BitmapSource
+    }
+    public class SewerPictureDocumentationViewModel : BaseViewModel
+    {
+        
+        public ObservableCollection<TabItem> Tabs { get; set; }
+
+        public SewerPictureDocumentationViewModel()
+        {
+            Tabs = new ObservableCollection<TabItem>();
+            Tabs.Add(new TabItem { Header = "One", Content = "One's content" });
+            Tabs.Add(new TabItem { Header = "Two", Content = "Two content" });
+        }
+    }
+
+    public sealed class TabItem
+    {
+        public string Header { get; set; }
+        public string Content { get; set; }
+    }
+}
diff --git a/DaSaSo.ViewModel/SewerPipeLinerViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerPipeLinerViewModel.cs
similarity index 97%
rename from DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerPipeLinerViewModel.cs
index 54fbbf2..fa0dafd 100644
--- a/DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerPipeLinerViewModel.cs
@@ -1,6 +1,6 @@
 using DaSaSo.Domain.Model;
-using DaSaSo.ViewModel.Controls;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Controls;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerPipeLinerViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/SewerStammdatenViewModel.cs b/DaSaSo.Wpf/ViewModel/SewerStammdatenViewModel.cs
similarity index 98%
rename from DaSaSo.ViewModel/SewerStammdatenViewModel.cs
rename to DaSaSo.Wpf/ViewModel/SewerStammdatenViewModel.cs
index d5133dc..d20772e 100644
--- a/DaSaSo.ViewModel/SewerStammdatenViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/SewerStammdatenViewModel.cs
@@ -2,8 +2,8 @@
 using DaSaSo.Domain.Services;
 using DaSaSo.Domain.Services.SewerPointServices;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -12,7 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public class SewerStammdatenViewModel : BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/State/ActualState/ActualProject.cs b/DaSaSo.Wpf/ViewModel/State/ActualState/ActualProject.cs
similarity index 97%
rename from DaSaSo.ViewModel/State/ActualState/ActualProject.cs
rename to DaSaSo.Wpf/ViewModel/State/ActualState/ActualProject.cs
index 3b2cd20..43fdc18 100644
--- a/DaSaSo.ViewModel/State/ActualState/ActualProject.cs
+++ b/DaSaSo.Wpf/ViewModel/State/ActualState/ActualProject.cs
@@ -1,12 +1,12 @@
 using DaSaSo.Domain.Model;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.State.ActualState
+namespace DaSaSo.Wpf.ViewModel.State.ActualState
 {
     public class ActualProject : IActualProject
     {
diff --git a/DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs b/DaSaSo.Wpf/ViewModel/State/Navigation/MainWindowNavigator.cs
similarity index 82%
rename from DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs
rename to DaSaSo.Wpf/ViewModel/State/Navigation/MainWindowNavigator.cs
index 61c1760..1f5e91b 100644
--- a/DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/State/Navigation/MainWindowNavigator.cs
@@ -1,11 +1,11 @@
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel.State.Navigation
+namespace DaSaSo.Wpf.ViewModel.State.Navigation
 {
     public class MainWindowNavigator : ObservableObject, IMainWindowNavigator
     {
diff --git a/DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs b/DaSaSo.Wpf/ViewModel/State/Navigation/SewerMainNavigator.cs
similarity index 86%
rename from DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs
rename to DaSaSo.Wpf/ViewModel/State/Navigation/SewerMainNavigator.cs
index f115f1a..54a7acb 100644
--- a/DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/State/Navigation/SewerMainNavigator.cs
@@ -1,11 +1,11 @@
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.State.Navigation
+namespace DaSaSo.Wpf.ViewModel.State.Navigation
 {
     public class SewerMainNavigator : ISewerMainNavigator
     {
diff --git a/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs b/DaSaSo.Wpf/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
similarity index 88%
rename from DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
rename to DaSaSo.Wpf/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
index d174446..5085790 100644
--- a/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
+++ b/DaSaSo.Wpf/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
@@ -1,11 +1,11 @@
-using DaSaSo.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DaSaSo.ViewModel.State.Navigation
+namespace DaSaSo.Wpf.ViewModel.State.Navigation
 {
     public class ViewModelDelegateRenavigator<TViewModel> : IRenavigator where TViewModel: BaseViewModel
     {
diff --git a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs b/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs
similarity index 96%
rename from DaSaSo.ViewModel/Window/MainWindowViewModel.cs
rename to DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs
index f7eae5a..c4b74a3 100644
--- a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs
+++ b/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs
@@ -3,10 +3,10 @@ using DaSaSo.Domain.Model;
 using DaSaSo.Domain.Services;
 using DaSaSo.EntityFramework;
 using DaSaSo.EntityFramework.Services;
-using DaSaSo.ViewModel.Commands;
-using DaSaSo.ViewModel.Enums;
-using DaSaSo.ViewModel.Interface;
-using DaSaSo.ViewModel.State.Navigation;
+using DaSaSo.Wpf.ViewModel.Commands;
+using DaSaSo.Wpf.ViewModel.Enums;
+using DaSaSo.Wpf.ViewModel.Interface;
+using DaSaSo.Wpf.ViewModel.State.Navigation;
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Win32;
 using System;
@@ -19,7 +19,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace DaSaSo.ViewModel
+namespace DaSaSo.Wpf.ViewModel
 {
     public sealed class MainWindowViewModel : BaseViewModel
     {
@@ -103,7 +103,7 @@ namespace DaSaSo.ViewModel
             {
                 string gitVersion;
 #pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
-                using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("DaSaSo.ViewModel.version.txt"))
+                using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("DaSaSo.Wpf.version.txt"))
 #pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
 #pragma warning disable CS8604 // Possible null reference argument.
                 using (StreamReader reader = new(stream))
diff --git a/DaSaSo.Wpf/Window/MainWindow.xaml b/DaSaSo.Wpf/Window/MainWindow.xaml
index de92b93..366262d 100644
--- a/DaSaSo.Wpf/Window/MainWindow.xaml
+++ b/DaSaSo.Wpf/Window/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:ImpregnationViews="clr-namespace:DaSaSo.Wpf.View.Impregnation"
         xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls"
         xmlns:View="clr-namespace:DaSaSo.Wpf.View"
-        xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
+        xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" 
         mc:Ignorable="d"
         Title="{Binding ApplicationTitle}" Height="450" Width="800" WindowState="Maximized" FontSize="20">
     <Window.Resources>
diff --git a/DaSaSo.sln b/DaSaSo.sln
index 4a5089c..e8a438e 100644
--- a/DaSaSo.sln
+++ b/DaSaSo.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.ConsoleApp", "DaSaSo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.Wpf", "DaSaSo.Wpf\DaSaSo.Wpf.csproj", "{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.ViewModel", "DaSaSo.ViewModel\DaSaSo.ViewModel.csproj", "{7CC8889C-87AD-4E32-B9AB-C4B322828797}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.InMemoryProvider", "DaSaSo.InMemoryProvider\DaSaSo.InMemoryProvider.csproj", "{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.DatabaseConverter", "DaSaSo.DatabaseConverter\DaSaSo.DatabaseConverter.csproj", "{E0842F1A-E74D-4B84-BD27-3585901B0DE9}"
@@ -44,10 +42,6 @@ Global
 		{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Release|Any CPU.Build.0 = Release|Any CPU
 		{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Release|Any CPU.ActiveCfg = Release|Any CPU