diff --git a/Gremlin/App.xaml b/Gremlin/App.xaml
index f6628d1..fa77e4c 100644
--- a/Gremlin/App.xaml
+++ b/Gremlin/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Gremlin.App"
+<Application x:Class="Gremlin.Gremlin.GremlinData.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="GremlinUI/QuoteUI.xaml">
diff --git a/Gremlin/GremlinData/DBClasses/DbHelper.cs b/Gremlin/GremlinData/DBClasses/DbHelper.cs
index 8bc0385..d378e4c 100644
--- a/Gremlin/GremlinData/DBClasses/DbHelper.cs
+++ b/Gremlin/GremlinData/DBClasses/DbHelper.cs
@@ -11,8 +11,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using static Gremlin.Enums;
+using static Gremlin.GremlinData.EntityClasses.Enums;
 using Gremlin.GremlinUtilities;
+using Gremlin.GremlinData.EntityClasses;
 
 namespace Gremlin.GremlinData.DBClasses
 {
diff --git a/Gremlin/GremlinData/DBClasses/Encryption.cs b/Gremlin/GremlinData/DBClasses/Encryption.cs
index 24dc804..80b40a6 100644
--- a/Gremlin/GremlinData/DBClasses/Encryption.cs
+++ b/Gremlin/GremlinData/DBClasses/Encryption.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Security;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.DBClasses
 {
     internal class Encryption
     {
diff --git a/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs b/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
index 3eb72c7..42040fb 100644
--- a/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
+++ b/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
@@ -1,7 +1,8 @@
-using Microsoft.EntityFrameworkCore;
+using Gremlin.GremlinData.EntityClasses;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.DBClasses
 {
     public class AccountConfiguration : IEntityTypeConfiguration<Account>
     {
diff --git a/Gremlin/GremlinData/DBClasses/GremlinContext.cs b/Gremlin/GremlinData/DBClasses/GremlinContext.cs
index e144f0a..eee3196 100644
--- a/Gremlin/GremlinData/DBClasses/GremlinContext.cs
+++ b/Gremlin/GremlinData/DBClasses/GremlinContext.cs
@@ -1,3 +1,4 @@
+using Gremlin.GremlinData.EntityClasses;
 using Gremlin.GremlinUI;
 using Microsoft.EntityFrameworkCore;
 using System;
diff --git a/Gremlin/GremlinData/EntityClasses/Account.cs b/Gremlin/GremlinData/EntityClasses/Account.cs
index 5699963..4aa4390 100644
--- a/Gremlin/GremlinData/EntityClasses/Account.cs
+++ b/Gremlin/GremlinData/EntityClasses/Account.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class Account : IMetadata
     //: IEquatable<Account>
diff --git a/Gremlin/GremlinData/EntityClasses/AccountType.cs b/Gremlin/GremlinData/EntityClasses/AccountType.cs
index 256352f..c4c87a6 100644
--- a/Gremlin/GremlinData/EntityClasses/AccountType.cs
+++ b/Gremlin/GremlinData/EntityClasses/AccountType.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class AccountType : IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/Contact.cs b/Gremlin/GremlinData/EntityClasses/Contact.cs
index fa2f981..ab85232 100644
--- a/Gremlin/GremlinData/EntityClasses/Contact.cs
+++ b/Gremlin/GremlinData/EntityClasses/Contact.cs
@@ -1,7 +1,6 @@
-using Gremlin.GremlinData.DBClasses;
-using System;
+using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class Contact : IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/CustomDescription.cs b/Gremlin/GremlinData/EntityClasses/CustomDescription.cs
index 64cac92..2db21c2 100644
--- a/Gremlin/GremlinData/EntityClasses/CustomDescription.cs
+++ b/Gremlin/GremlinData/EntityClasses/CustomDescription.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class CustomDescription : IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/Enums.cs b/Gremlin/GremlinData/EntityClasses/Enums.cs
index e447d0b..2d0c5b1 100644
--- a/Gremlin/GremlinData/EntityClasses/Enums.cs
+++ b/Gremlin/GremlinData/EntityClasses/Enums.cs
@@ -1,6 +1,6 @@
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
-    class Enums
+    internal class Enums
     {
         public enum Status : byte
         {
diff --git a/Gremlin/GremlinData/EntityClasses/IMetadata.cs b/Gremlin/GremlinData/EntityClasses/IMetadata.cs
index 3f95cb5..9f869cb 100644
--- a/Gremlin/GremlinData/EntityClasses/IMetadata.cs
+++ b/Gremlin/GremlinData/EntityClasses/IMetadata.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public interface IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/LineItem.cs b/Gremlin/GremlinData/EntityClasses/LineItem.cs
index 2855c46..cc2a166 100644
--- a/Gremlin/GremlinData/EntityClasses/LineItem.cs
+++ b/Gremlin/GremlinData/EntityClasses/LineItem.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class LineItem
     {
diff --git a/Gremlin/GremlinData/EntityClasses/LoggedInUser.cs b/Gremlin/GremlinData/EntityClasses/LoggedInUser.cs
index 9e2e36d..9937267 100644
--- a/Gremlin/GremlinData/EntityClasses/LoggedInUser.cs
+++ b/Gremlin/GremlinData/EntityClasses/LoggedInUser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class LoggedInUser
     {
diff --git a/Gremlin/GremlinData/EntityClasses/LoggedInUserSettings.cs b/Gremlin/GremlinData/EntityClasses/LoggedInUserSettings.cs
index 93c9f06..0e10a45 100644
--- a/Gremlin/GremlinData/EntityClasses/LoggedInUserSettings.cs
+++ b/Gremlin/GremlinData/EntityClasses/LoggedInUserSettings.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class LoggedInUserSettings
     {
diff --git a/Gremlin/GremlinData/EntityClasses/Product.cs b/Gremlin/GremlinData/EntityClasses/Product.cs
index b1a092e..08ef892 100644
--- a/Gremlin/GremlinData/EntityClasses/Product.cs
+++ b/Gremlin/GremlinData/EntityClasses/Product.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class Product : IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/ProductLine.cs b/Gremlin/GremlinData/EntityClasses/ProductLine.cs
index ab1478e..5d87849 100644
--- a/Gremlin/GremlinData/EntityClasses/ProductLine.cs
+++ b/Gremlin/GremlinData/EntityClasses/ProductLine.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class ProductLine : IMetadata
     {
diff --git a/Gremlin/GremlinData/EntityClasses/Quote.cs b/Gremlin/GremlinData/EntityClasses/Quote.cs
index 21ae520..ebae132 100644
--- a/Gremlin/GremlinData/EntityClasses/Quote.cs
+++ b/Gremlin/GremlinData/EntityClasses/Quote.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class Quote
     {
@@ -34,18 +34,17 @@ namespace Gremlin
         public bool QuoteContainsRB { get; set; }
         public string QuoteTemplate { get; set; }
 
-
         internal Quote()
         {
-            //Initialize
-            QuotationDate = DateTime.Now;
-            //LineItems = new List<LineItem>();
-            TotalGross = 0;
-            TotalListprice = 0;
-            TotalDiscount = 0;
-            TotalNet = 0;
-            QuoteContains3PP = false;
-            QuoteContainsRB = false;
+            ////Initialize
+            //QuotationDate = DateTime.Now;
+            ////LineItems = new List<LineItem>();
+            //TotalGross = 0;
+            //TotalListprice = 0;
+            //TotalDiscount = 0;
+            //TotalNet = 0;
+            //QuoteContains3PP = false;
+            //QuoteContainsRB = false;
 
             // set quote number
             // set validity depending on account classification
diff --git a/Gremlin/GremlinData/EntityClasses/RUSetting.cs b/Gremlin/GremlinData/EntityClasses/RUSetting.cs
index 5d928f9..285f36a 100644
--- a/Gremlin/GremlinData/EntityClasses/RUSetting.cs
+++ b/Gremlin/GremlinData/EntityClasses/RUSetting.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class RUSetting
     {
diff --git a/Gremlin/GremlinData/EntityClasses/RegisteredUser.cs b/Gremlin/GremlinData/EntityClasses/RegisteredUser.cs
index 23a8f9b..bccb0ec 100644
--- a/Gremlin/GremlinData/EntityClasses/RegisteredUser.cs
+++ b/Gremlin/GremlinData/EntityClasses/RegisteredUser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class RegisteredUser
     {
diff --git a/Gremlin/GremlinData/EntityClasses/SubMarket.cs b/Gremlin/GremlinData/EntityClasses/SubMarket.cs
index 3021e09..b404ac8 100644
--- a/Gremlin/GremlinData/EntityClasses/SubMarket.cs
+++ b/Gremlin/GremlinData/EntityClasses/SubMarket.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Gremlin
+namespace Gremlin.GremlinData.EntityClasses
 {
     public class SubMarket : IMetadata
     {
diff --git a/Gremlin/GremlinDataAccess/ContactDAL.cs b/Gremlin/GremlinDataAccess/ContactDAL.cs
index c625290..651b16c 100644
--- a/Gremlin/GremlinDataAccess/ContactDAL.cs
+++ b/Gremlin/GremlinDataAccess/ContactDAL.cs
@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using Gremlin.GremlinData.EntityClasses;
+using System.Collections.ObjectModel;
 
 namespace Gremlin.DataAccessLayer
 {
diff --git a/Gremlin/GremlinUI/ChooseDB.xaml b/Gremlin/GremlinUI/ChooseDB.xaml
index 1aebf6c..6c8688f 100644
--- a/Gremlin/GremlinUI/ChooseDB.xaml
+++ b/Gremlin/GremlinUI/ChooseDB.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="ChooseDB" Height="309" Width="600" 
+        Title="Datenbank auswählen" Height="309" Width="600" 
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen" 
         SizeToContent="Height" 
diff --git a/Gremlin/GremlinUI/MainWindow.xaml.cs b/Gremlin/GremlinUI/MainWindow.xaml.cs
index 1c06da5..e7e556f 100644
--- a/Gremlin/GremlinUI/MainWindow.xaml.cs
+++ b/Gremlin/GremlinUI/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Gremlin.GremlinData.DBClasses;
+using Gremlin.GremlinData.EntityClasses;
 using Gremlin.GremlinUI.ViewModels;
 using Gremlin.Models;
 using Microsoft.Win32;
@@ -85,7 +86,7 @@ namespace Gremlin.GremlinUI
 
         private void BtnRefreshAccountList_Click(object sender, RoutedEventArgs e)
         {
-            ObservableCollection<Account> accounts = new(AccountViewModel.GetAccounts());
+            ObservableCollection<Account> accounts = new(AcountVM.GetAccounts());
             dg_Test.ItemsSource = accounts;
         }
 
diff --git a/Gremlin/GremlinUI/Models/ContactModel.cs b/Gremlin/GremlinUI/Models/ContactModel.cs
index 8b17f16..cea2ee5 100644
--- a/Gremlin/GremlinUI/Models/ContactModel.cs
+++ b/Gremlin/GremlinUI/Models/ContactModel.cs
@@ -1,4 +1,5 @@
 using Gremlin.DataAccessLayer;
+using Gremlin.GremlinData.EntityClasses;
 using System.Collections.ObjectModel;
 
 namespace Gremlin.Models
diff --git a/Gremlin/GremlinUI/Models/RUSettingModel.cs b/Gremlin/GremlinUI/Models/RUSettingModel.cs
index 26e2cfb..766269f 100644
--- a/Gremlin/GremlinUI/Models/RUSettingModel.cs
+++ b/Gremlin/GremlinUI/Models/RUSettingModel.cs
@@ -1,4 +1,5 @@
 using Gremlin.GremlinData.DBClasses;
+using Gremlin.GremlinData.EntityClasses;
 using Gremlin.GremlinUI;
 using System;
 using System.Collections.Generic;
diff --git a/Gremlin/GremlinUI/Models/RegisteredUserModel.cs b/Gremlin/GremlinUI/Models/RegisteredUserModel.cs
index cf68f8b..4916bbd 100644
--- a/Gremlin/GremlinUI/Models/RegisteredUserModel.cs
+++ b/Gremlin/GremlinUI/Models/RegisteredUserModel.cs
@@ -1,4 +1,5 @@
 using Gremlin.GremlinData.DBClasses;
+using Gremlin.GremlinData.EntityClasses;
 using System.Linq;
 
 namespace Gremlin.Models
diff --git a/Gremlin/GremlinUI/Operations/CustomDescriptionOperations.cs b/Gremlin/GremlinUI/Operations/CustomDescriptionOperations.cs
index ec896a1..9d5c393 100644
--- a/Gremlin/GremlinUI/Operations/CustomDescriptionOperations.cs
+++ b/Gremlin/GremlinUI/Operations/CustomDescriptionOperations.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Gremlin.GremlinData.EntityClasses;
+using System.Collections.Generic;
 
 namespace Gremlin.Operations
 {
diff --git a/Gremlin/GremlinUI/Operations/LineItemOperations.cs b/Gremlin/GremlinUI/Operations/LineItemOperations.cs
index 2823f7e..c6668ad 100644
--- a/Gremlin/GremlinUI/Operations/LineItemOperations.cs
+++ b/Gremlin/GremlinUI/Operations/LineItemOperations.cs
@@ -1,4 +1,6 @@
-namespace Gremlin.Operations
+using Gremlin.GremlinData.EntityClasses;
+
+namespace Gremlin.Operations
 {
     public class LineItemOperations
     {
diff --git a/Gremlin/GremlinUI/Operations/ProductOperations.cs b/Gremlin/GremlinUI/Operations/ProductOperations.cs
index 47cb1f5..598936a 100644
--- a/Gremlin/GremlinUI/Operations/ProductOperations.cs
+++ b/Gremlin/GremlinUI/Operations/ProductOperations.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Gremlin.GremlinData.EntityClasses;
+using System.Collections.Generic;
 
 namespace Gremlin.Operations
 {
diff --git a/Gremlin/GremlinUI/Operations/TexFileHandler.cs b/Gremlin/GremlinUI/Operations/TexFileHandler.cs
index b276551..1796e01 100644
--- a/Gremlin/GremlinUI/Operations/TexFileHandler.cs
+++ b/Gremlin/GremlinUI/Operations/TexFileHandler.cs
@@ -1,9 +1,9 @@
-using Gremlin.Models;
-using Gremlin.ViewModels;
+using Gremlin.GremlinData.EntityClasses;
+using Gremlin.Models;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using static Gremlin.Enums;
+using static Gremlin.GremlinData.EntityClasses.Enums;
 
 namespace Gremlin.Operations
 {
diff --git a/Gremlin/GremlinUI/QuoteUI.xaml b/Gremlin/GremlinUI/QuoteUI.xaml
index cca02fa..da9a728 100644
--- a/Gremlin/GremlinUI/QuoteUI.xaml
+++ b/Gremlin/GremlinUI/QuoteUI.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodels="clr-namespace:Gremlin.GremlinUI.ViewModels" d:DataContext="{d:DesignInstance Type=viewmodels:AccountViewModel}"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
@@ -81,7 +81,8 @@
         <Grid Grid.Row="1" Height="Auto" x:Name="gridMitte" Margin="10,5,10,5" Grid.RowSpan="2">
             <StackPanel>
                 <Button x:Name="butPasteQuote" Content="Angebot aus PriceSurfer einfügen" Margin="10,5,10,5" Click="ButPasteQuote_Click" />
-                <DataGrid x:Name="dgQuote" AutoGenerateColumns="True" Height="470" Margin="10,5,10,5" />
+                <DataGrid x:Name="dgLineItems" AutoGenerateColumns="True" Height="370" Margin="10,5,10,5" />
+                <TextBlock x:Name="lblQuote" Height="100" Margin="10,5,10,5" />
             </StackPanel>
         </Grid>
 
diff --git a/Gremlin/GremlinUI/QuoteUI.xaml.cs b/Gremlin/GremlinUI/QuoteUI.xaml.cs
index a0ad03f..d200c55 100644
--- a/Gremlin/GremlinUI/QuoteUI.xaml.cs
+++ b/Gremlin/GremlinUI/QuoteUI.xaml.cs
@@ -1,6 +1,6 @@
-using Gremlin.GremlinUI.ViewModels;
+using Gremlin.GremlinData.EntityClasses;
+using Gremlin.GremlinUI.ViewModels;
 using Gremlin.ViewModels;
-using Gremlin.Views;
 using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Data;
@@ -10,33 +10,37 @@ namespace Gremlin.GremlinUI
     public partial class QuoteUI : Window
     {
         private static ListCollectionView listCollectionContacts = new(new ObservableCollection<Contact>());
-        private static ListCollectionView lineItems = new(new ObservableCollection<LineItemViewModel>());
+        private static ListCollectionView lineItems = new(new ObservableCollection<LineItemVM>());
 
         public QuoteUI()
         {
             InitializeComponent();
-            listCollectionContacts = new(ContactViewModel.GetContacts());
-            listCollectionContacts.Filter = ContactViewModel.SearchContact(listCollectionContacts, tbContactSearch.Text);
+            listCollectionContacts = new(ContactVM.GetContacts());
+            listCollectionContacts.Filter = ContactVM.SearchContact(listCollectionContacts, tbContactSearch.Text);
             dgFoundContacts.ItemsSource = listCollectionContacts;
-            dgQuote.ItemsSource = lineItems;
+            dgLineItems.ItemsSource = lineItems;
         }
 
         private void TbContactSearch_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
-            listCollectionContacts.Filter = ContactViewModel.SearchContact(listCollectionContacts, tbContactSearch.Text);
+            listCollectionContacts.Filter = ContactVM.SearchContact(listCollectionContacts, tbContactSearch.Text);
         }
 
         private void DgFoundContacts_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
-            txAnschreiben.Text = QuoteView.FilterContacts(dgFoundContacts.SelectedItem);
+            txAnschreiben.Text = ContactVM.FilterContacts(dgFoundContacts.SelectedItem);
         }
 
         private void ButPasteQuote_Click(object sender, RoutedEventArgs e)
         {
-            ObservableCollection<LineItemViewModel> lineItemsViewModel = QuoteView.ReadLineItemsFromClipboard();
+            QuoteVM quoteVM = QuoteVM.CreateQuoteFromClipboard(tbQuotationNumber.Text, (ContactVM)dgFoundContacts.SelectedItem, null);
+
+            ObservableCollection<LineItemVM> lineItemsViewModel = LineItemVM.ReadLineItemsFromClipboard();
+
+            lblQuote.Text = $"{quoteVM.QuotationNumber}, {quoteVM.Recipient}, {quoteVM.SalesRep}, {quoteVM.TotalListprice}, {quoteVM.TotalDiscount}, {quoteVM.TotalNet}, {quoteVM.VAT}, {quoteVM.QuoteContains3PP}, {quoteVM.QuoteContainsRB}";
+
             lineItems = new(lineItemsViewModel);
-            dgQuote.ItemsSource = lineItems;
-            QuoteViewModel quoteViewModel = QuoteView.CreateQuote(tbQuotationNumber.Text, (ContactViewModel)dgFoundContacts.SelectedItem, null, LineItemViewModel.GetTotalListprice(lineItemsViewModel), LineItemViewModel.GetTotalDiscount(lineItemsViewModel), LineItemViewModel.GetTotalNet(lineItemsViewModel), 19f, false, false);
+            dgLineItems.ItemsSource = lineItems;
         }
     }
 }
diff --git a/Gremlin/GremlinUI/ViewModels/AccountViewModel.cs b/Gremlin/GremlinUI/ViewModels/AccountViewModel.cs
deleted file mode 100644
index 46ab5ca..0000000
--- a/Gremlin/GremlinUI/ViewModels/AccountViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Gremlin.GremlinData.DBClasses;
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Gremlin.GremlinUI.ViewModels
-{
-    internal class AccountViewModel : BaseViewModel
-    {
-        public static ObservableCollection<Account> GetAccounts()
-        {
-            try
-            {
-                using (GremlinContext gremlinContext = new())
-                {
-                    return new ObservableCollection<Account>(gremlinContext.Accounts.ToList());
-                }
-            }
-            catch (Exception ex)
-            {
-                ErrorHandler.ShowErrorInMessageBox(ex);
-                return null;
-                throw;
-            }
-        }
-    }
-}
diff --git a/Gremlin/GremlinUI/ViewModels/BaseViewModel.cs b/Gremlin/GremlinUI/ViewModels/BaseVM.cs
similarity index 84%
rename from Gremlin/GremlinUI/ViewModels/BaseViewModel.cs
rename to Gremlin/GremlinUI/ViewModels/BaseVM.cs
index e76f61a..c0f2cd2 100644
--- a/Gremlin/GremlinUI/ViewModels/BaseViewModel.cs
+++ b/Gremlin/GremlinUI/ViewModels/BaseVM.cs
@@ -2,7 +2,7 @@
 
 namespace Gremlin.GremlinUI.ViewModels
 {
-    internal class BaseViewModel : INotifyPropertyChanged
+    internal class BaseVM : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
diff --git a/Gremlin/GremlinUI/ViewModels/ContactViewModel.cs b/Gremlin/GremlinUI/ViewModels/ContactVM.cs
similarity index 58%
rename from Gremlin/GremlinUI/ViewModels/ContactViewModel.cs
rename to Gremlin/GremlinUI/ViewModels/ContactVM.cs
index f12a9bc..26534ac 100644
--- a/Gremlin/GremlinUI/ViewModels/ContactViewModel.cs
+++ b/Gremlin/GremlinUI/ViewModels/ContactVM.cs
@@ -7,10 +7,11 @@ using System.Linq;
 using System.Text;
 using System.Windows.Data;
 using Microsoft.EntityFrameworkCore;
+using Gremlin.GremlinData.EntityClasses;
 
 namespace Gremlin.ViewModels
 {
-    internal class ContactViewModel : BaseViewModel
+    internal class ContactVM : BaseVM
     {
         public byte Gender { get; private set; }
         public string FirstName { get; private set; }
@@ -21,11 +22,25 @@ namespace Gremlin.ViewModels
         public uint AccountZIP { get; private set; }
         public string AccountCity { get; private set; }
 
+        public ContactVM() { }
+
+        public ContactVM(byte gender, string firstName, string lastName, string eMail, string accountName, string accountStreet, uint accountZIP, string accountCity)
+        {
+            Gender = gender;
+            FirstName = firstName ?? throw new ArgumentNullException(nameof(firstName));
+            LastName = lastName ?? throw new ArgumentNullException(nameof(lastName));
+            EMail = eMail ?? throw new ArgumentNullException(nameof(eMail));
+            AccountName = accountName ?? throw new ArgumentNullException(nameof(accountName));
+            AccountStreet = accountStreet ?? throw new ArgumentNullException(nameof(accountStreet));
+            AccountZIP = accountZIP;
+            AccountCity = accountCity ?? throw new ArgumentNullException(nameof(accountCity));
+        }
+
         internal static Predicate<object> SearchContact(ListCollectionView listCollectionContacts, string search)
         {
             return listCollectionContacts.Filter = (c) =>
             {
-                ContactViewModel contact = c as ContactViewModel;
+                ContactVM contact = c as ContactVM;
                 return contact.LastName.ToLower().Contains(search.ToLower())
                     || contact.FirstName.ToLower().Contains(search.ToLower())
                     || contact.AccountName.ToLower().Contains(search.ToLower())
@@ -33,18 +48,45 @@ namespace Gremlin.ViewModels
             };
         }
 
-        public static ObservableCollection<ContactViewModel> GetContacts()
+        internal static string FilterContacts(object selectedItem)
+        {
+            return selectedItem == null
+                ? "Kein Kontakt gefunden!"
+                : selectedItem == CollectionView.NewItemPlaceholder
+                    ? "Bitte neuen Kontakt erstellen"
+                    : CreateBriefkopf(selectedItem as ContactVM).ToString();
+        }
+
+        internal static ContactVM GetSalesRepAsContact()
+        {
+            //Get SalesRep Contact Details from logged-in User
+            //TODO
+
+            //Standard SalesRep
+            ContactVM salesRep = new((byte)Enums.Gender.Male,
+                                            "Sascha",
+                                            "Woitschetzki",
+                                            "sascha.woitschetzki@non.agilent.com",
+                                            "Handelsvertretung Sascha Woitschetzki",
+                                            "Parsevalstr. 58",
+                                            45470,
+                                            "Mülheim an der Ruhr");
+
+            return salesRep;
+        }
+
+        public static ObservableCollection<ContactVM> GetContacts()
         {
             try
             {
                 using (GremlinContext gremlinContext = new())
                 {
                     List<Contact> contacts = gremlinContext.Contacts.Include(contact => contact.Account).ToList();
-                    ObservableCollection<ContactViewModel> contactsViewModel = new();
+                    ObservableCollection<ContactVM> contactsViewModel = new();
 
                     foreach (Contact contact in contacts)
                     {
-                        ContactViewModel contactViewModel = new();
+                        ContactVM contactViewModel = new();
                         contactViewModel.Gender = contact.Gender;
                         contactViewModel.LastName = contact.LastName;
                         contactViewModel.FirstName = contact.FirstName;
@@ -70,7 +112,7 @@ namespace Gremlin.ViewModels
             }
         }
 
-        internal static StringBuilder CreateBriefkopf(ContactViewModel contactViewModel)
+        internal static StringBuilder CreateBriefkopf(ContactVM contactViewModel)
         {
             StringBuilder briefkopf = new();
 
diff --git a/Gremlin/GremlinUI/ViewModels/LineItemViewModel.cs b/Gremlin/GremlinUI/ViewModels/LineItemVM.cs
similarity index 66%
rename from Gremlin/GremlinUI/ViewModels/LineItemViewModel.cs
rename to Gremlin/GremlinUI/ViewModels/LineItemVM.cs
index cd4e28d..efcb0f8 100644
--- a/Gremlin/GremlinUI/ViewModels/LineItemViewModel.cs
+++ b/Gremlin/GremlinUI/ViewModels/LineItemVM.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows;
-using System.Windows.Data;
 
 namespace Gremlin.GremlinUI.ViewModels
 {
-    internal class LineItemViewModel : BaseViewModel
+    internal class LineItemVM : BaseVM
     {
         public ushort Position { get; set; }
         public ushort Amount { get; set; }
@@ -22,11 +21,41 @@ namespace Gremlin.GremlinUI.ViewModels
         //public decimal DemoDiscount { get; set; }
         public decimal ListPrice { get; set; }
         public decimal NetPrice { get; set; }
-        public decimal Total { get; set; }
+        public decimal TotalNet { get; set; }
 
-        public static ObservableCollection<LineItemViewModel> ParseClipboardList(IEnumerable<string[]> lineItemStrings)
+        internal static ObservableCollection<LineItemVM> ReadLineItemsFromClipboard()
         {
-            ObservableCollection<LineItemViewModel> lineItems = new();
+            if (Clipboard.GetText() != "")
+            {
+                //Clipboard einlesen
+                string clipboard = Clipboard.GetText();
+
+                //Zeilen aufteilen
+                IEnumerable<string> clipboardLines = clipboard.Split(Environment.NewLine.ToCharArray());
+                List<string[]> clipboardList = new();
+
+                foreach (string clipboardLine in clipboardLines)
+                {
+                    if (clipboardLine != "")
+                    {
+                        //Nach Trennzeichen trennen
+                        string[] clipboardLineSplit = clipboardLine.Split('\t');
+                        clipboardList.Add(clipboardLineSplit);
+                    }
+                }
+
+                return LineItemVM.ParseClipboardList(clipboardList);
+            }
+            else
+            {
+                _ = MessageBox.Show("Clipboard ist leer!");
+                return null;
+            }
+        }
+
+        public static ObservableCollection<LineItemVM> ParseClipboardList(IEnumerable<string[]> lineItemStrings)
+        {
+            ObservableCollection<LineItemVM> lineItems = new();
             int countError = 0;
             int countEmpty = 0;
 
@@ -43,7 +72,7 @@ namespace Gremlin.GremlinUI.ViewModels
                     }
 
                     //Dateiinhalt in Klasse schreiben
-                    LineItemViewModel lineItem = new();
+                    LineItemVM lineItem = new();
                     lineItem.Position = ushort.Parse(lineItemString[0]);
                     lineItem.ProductNumber = lineItemString[1];
                     lineItem.OptionNumber = lineItemString[2];
@@ -53,7 +82,7 @@ namespace Gremlin.GremlinUI.ViewModels
                     lineItem.ListPrice = decimal.Parse(lineItemString[6]);
                     lineItem.TotalDiscount = decimal.Parse(lineItemString[9]);
                     lineItem.NetPrice = decimal.Parse(lineItemString[10]);
-                    lineItem.Total = decimal.Parse(lineItemString[11]);
+                    lineItem.TotalNet = decimal.Parse(lineItemString[11]);
                     //lineItem.SalesDiscount = decimal.Parse(lineItemString[12]);
                     //lineItem.ContractualDiscount = decimal.Parse(lineItemString[13]);
                     //lineItem.PromotionalDiscount = decimal.Parse(lineItemString[14]);
@@ -72,30 +101,30 @@ namespace Gremlin.GremlinUI.ViewModels
             return lineItems;
         }
 
-        internal static decimal GetTotalNet(ObservableCollection<LineItemViewModel> lineItems)
+        internal static decimal GetTotalNet(ObservableCollection<LineItemVM> lineItems)
         {
             decimal totalNet = 0;
-            foreach (LineItemViewModel lineItem in lineItems)
+            foreach (LineItemVM lineItem in lineItems)
             {
                 totalNet += lineItem.NetPrice;
             }
             return totalNet;
         }
 
-        internal static decimal GetTotalDiscount(ObservableCollection<LineItemViewModel> lineItems)
+        internal static decimal GetTotalDiscount(ObservableCollection<LineItemVM> lineItems)
         {
             decimal totalDiscount = 0;
-            foreach (LineItemViewModel lineItem in lineItems)
+            foreach (LineItemVM lineItem in lineItems)
             {
                 totalDiscount += lineItem.TotalDiscount;
             }
             return totalDiscount;
         }
 
-        internal static decimal GetTotalListprice(ObservableCollection<LineItemViewModel> lineItems)
+        internal static decimal GetTotalListprice(ObservableCollection<LineItemVM> lineItems)
         {
             decimal totalListprice = 0;
-            foreach (LineItemViewModel lineItem in lineItems)
+            foreach (LineItemVM lineItem in lineItems)
             {
                 totalListprice += lineItem.ListPrice;
             }
diff --git a/Gremlin/GremlinUI/ViewModels/QuoteVM.cs b/Gremlin/GremlinUI/ViewModels/QuoteVM.cs
new file mode 100644
index 0000000..2e71c88
--- /dev/null
+++ b/Gremlin/GremlinUI/ViewModels/QuoteVM.cs
@@ -0,0 +1,76 @@
+using Gremlin.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Gremlin.GremlinUI.ViewModels
+{
+    internal class QuoteVM : BaseVM
+    {
+        public string QuotationNumber { get; set; }
+        public ContactVM Recipient { get; set; }
+        public ContactVM SalesRep { get; set; }
+        public ICollection<LineItemVM> LineItemsVM { get; set; }
+        public decimal TotalListprice { get; set; }
+        public decimal TotalDiscount { get; set; }
+        public decimal TotalNet { get; set; }
+        public float VAT { get; set; }
+        public bool QuoteContains3PP { get; set; }
+        public bool QuoteContainsRB { get; set; }
+
+        internal QuoteVM() { }
+
+        internal QuoteVM(string quotationNumber, ContactVM recipient, ContactVM salesRep, decimal totalListprice, decimal totalDiscount, decimal totalNet, float vAT, bool quoteContains3PP, bool quoteContainsRB)
+        {
+            QuotationNumber = quotationNumber ?? throw new ArgumentNullException(nameof(quotationNumber));
+            Recipient = recipient ?? throw new ArgumentNullException(nameof(recipient));
+            SalesRep = salesRep ?? throw new ArgumentNullException(nameof(salesRep));
+            TotalListprice = totalListprice;
+            TotalDiscount = totalDiscount;
+            TotalNet = totalNet;
+            VAT = vAT;
+            QuoteContains3PP = quoteContains3PP;
+            QuoteContainsRB = quoteContainsRB;
+        }
+
+        internal static QuoteVM CreateQuoteFromClipboard(string quotationNumber, ContactVM recipient, ContactVM salesRep, float vAT = 19f)
+        {
+            QuoteVM quoteVM = new();
+
+            decimal totalListprice = 0, totalDiscount = 0, totalNet = 0;
+            bool quoteContains3PP = false, quoteContainsRB = false;
+
+            quoteVM.QuotationNumber = quotationNumber;
+            quoteVM.Recipient = recipient;
+            quoteVM.SalesRep = salesRep;
+            quoteVM.VAT = vAT;
+
+            ObservableCollection<LineItemVM> lineItemsVM = LineItemVM.ReadLineItemsFromClipboard();
+            foreach (LineItemVM lineItemVM in lineItemsVM)
+            {
+                totalListprice += lineItemVM.ListPrice;
+                totalDiscount += lineItemVM.TotalDiscount;
+                totalNet += lineItemVM.TotalNet;
+
+                if (lineItemVM.ProductLine == "RB")
+                {
+                    quoteContainsRB = true;
+                }
+                else if (lineItemVM.ProductLine == "3PP")
+                {
+                    quoteContains3PP = true;
+                }
+
+                quoteVM.LineItemsVM.Add(lineItemVM);
+            }
+
+            quoteVM.TotalListprice = totalListprice;
+            quoteVM.TotalDiscount = totalDiscount;
+            quoteVM.TotalNet = totalNet;
+            quoteVM.QuoteContainsRB = quoteContainsRB;
+            quoteVM.QuoteContains3PP = quoteContains3PP;
+
+            return quoteVM;
+        }
+    }
+}
diff --git a/Gremlin/GremlinUI/ViewModels/QuoteViewModel.cs b/Gremlin/GremlinUI/ViewModels/QuoteViewModel.cs
deleted file mode 100644
index 6668169..0000000
--- a/Gremlin/GremlinUI/ViewModels/QuoteViewModel.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Gremlin.ViewModels;
-using System;
-
-namespace Gremlin.GremlinUI.ViewModels
-{
-    internal class QuoteViewModel : BaseViewModel
-    {
-        public string QuotationNumber { get; set; }
-        public ContactViewModel Recipient { get; set; }
-        public ContactViewModel SalesRep { get; set; }
-        public decimal TotalListprice { get; set; }
-        public decimal TotalDiscount { get; set; }
-        public decimal TotalNet { get; set; }
-        public float VAT { get; set; }
-        public bool QuoteContains3PP { get; set; }
-        public bool QuoteContainsRB { get; set; }
-
-        internal QuoteViewModel()
-        {
-        }
-
-        internal QuoteViewModel(string quotationNumber, ContactViewModel recipient, ContactViewModel salesRep, decimal totalListprice, decimal totalDiscount, decimal totalNet, float vAT, bool quoteContains3PP, bool quoteContainsRB)
-        {
-            QuotationNumber = quotationNumber ?? throw new ArgumentNullException(nameof(quotationNumber));
-            Recipient = recipient ?? throw new ArgumentNullException(nameof(recipient));
-            SalesRep = salesRep;
-            TotalListprice = totalListprice;
-            TotalDiscount = totalDiscount;
-            TotalNet = totalNet;
-            VAT = vAT;
-            QuoteContains3PP = quoteContains3PP;
-            QuoteContainsRB = quoteContainsRB;
-        }
-    }
-}
diff --git a/Gremlin/GremlinUI/Views/QuoteView.cs b/Gremlin/GremlinUI/Views/QuoteView.cs
deleted file mode 100644
index ae81593..0000000
--- a/Gremlin/GremlinUI/Views/QuoteView.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Gremlin.GremlinData.DBClasses;
-using Gremlin.GremlinUI.ViewModels;
-using Gremlin.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Gremlin.Views
-{
-    internal class QuoteView
-    {
-        internal static ObservableCollection<LineItemViewModel> ReadLineItemsFromClipboard()
-        {
-            if (Clipboard.GetText() != "")
-            {
-                //Clipboard einlesen
-                string clipboard = Clipboard.GetText();
-
-                //Zeilen aufteilen
-                IEnumerable<string> clipboardLines = clipboard.Split(Environment.NewLine.ToCharArray());
-                List<string[]> clipboardList = new();
-
-                foreach (string clipboardLine in clipboardLines)
-                {
-                    if (clipboardLine != "")
-                    {
-                        //Nach Trennzeichen trennen
-                        string[] clipboardLineSplit = clipboardLine.Split('\t');
-                        clipboardList.Add(clipboardLineSplit);
-                    }
-                }
-
-                return LineItemViewModel.ParseClipboardList(clipboardList);
-            }
-            else
-            {
-                _ = MessageBox.Show("Clipboard ist leer!");
-                return null;
-            }
-        }
-
-        internal static string FilterContacts(object selectedItem)
-        {
-            return selectedItem == null
-                ? "Kein Kontakt gefunden!"
-                : selectedItem == CollectionView.NewItemPlaceholder
-                    ? "Bitte neuen Kontakt erstellen"
-                    : ContactViewModel.CreateBriefkopf(selectedItem as ContactViewModel).ToString();
-        }
-
-        internal static QuoteViewModel CreateQuote(string quotationNumber, ContactViewModel recipient, ContactViewModel salesRep, decimal totalListprice, decimal totalDiscount, decimal totalNet, float vAT, bool quoteContains3PP, bool quoteContainsRB)
-        {
-            QuoteViewModel quoteViewModel = new(quotationNumber, recipient, salesRep, totalListprice, totalDiscount, totalNet, vAT, quoteContains3PP, quoteContainsRB);
-            using (GremlinContext gremlinContext = new())
-            {
-                //write qoteViewModel into Quote in DB
-            }
-            return quoteViewModel;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Gremlin/Properties/launchSettings.json b/Gremlin/Properties/launchSettings.json
index 33f2365..bad924b 100644
--- a/Gremlin/Properties/launchSettings.json
+++ b/Gremlin/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Gremlin": {
       "commandName": "Project",
       "sqlDebugging": true,
-      "nativeDebugging": true
+      "nativeDebugging": false
     }
   }
 }
\ No newline at end of file