diff --git a/Elwig/Documents/BusinessDocument.cs b/Elwig/Documents/BusinessDocument.cs
index 28752bb..53b061e 100644
--- a/Elwig/Documents/BusinessDocument.cs
+++ b/Elwig/Documents/BusinessDocument.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {
diff --git a/Elwig/Documents/BusinessLetter.cs b/Elwig/Documents/BusinessLetter.cs
index 4fac26d..e1e1ba0 100644
--- a/Elwig/Documents/BusinessLetter.cs
+++ b/Elwig/Documents/BusinessLetter.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class BusinessLetter : BusinessDocument {
diff --git a/Elwig/Documents/CreditNote.cs b/Elwig/Documents/CreditNote.cs
index d674737..138c1b7 100644
--- a/Elwig/Documents/CreditNote.cs
+++ b/Elwig/Documents/CreditNote.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Elwig/Documents/DeliveryConfirmation.cs b/Elwig/Documents/DeliveryConfirmation.cs
index c29dc23..a8aa8e6 100644
--- a/Elwig/Documents/DeliveryConfirmation.cs
+++ b/Elwig/Documents/DeliveryConfirmation.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
diff --git a/Elwig/Documents/DeliveryJournal.cs b/Elwig/Documents/DeliveryJournal.cs
index 2e02f81..917076c 100644
--- a/Elwig/Documents/DeliveryJournal.cs
+++ b/Elwig/Documents/DeliveryJournal.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
diff --git a/Elwig/Documents/DeliveryNote.cs b/Elwig/Documents/DeliveryNote.cs
index 3965c07..3eebc50 100644
--- a/Elwig/Documents/DeliveryNote.cs
+++ b/Elwig/Documents/DeliveryNote.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Collections.Generic;
 
 namespace Elwig.Documents {
diff --git a/Elwig/Documents/Letterhead.cs b/Elwig/Documents/Letterhead.cs
index 588e5f5..f95277d 100644
--- a/Elwig/Documents/Letterhead.cs
+++ b/Elwig/Documents/Letterhead.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {
diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs
index 1945aa0..860ac2f 100644
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Linq;
 using System.Threading.Tasks;
 using System.IO;
diff --git a/Elwig/Helpers/Billing/Transaction.cs b/Elwig/Helpers/Billing/Transaction.cs
index 0eaba3d..8a84371 100644
--- a/Elwig/Helpers/Billing/Transaction.cs
+++ b/Elwig/Helpers/Billing/Transaction.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs
index 2ba4f86..586b505 100644
--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Elwig/Helpers/Export/Ebics.cs b/Elwig/Helpers/Export/Ebics.cs
index 9bbc27f..cdbf74f 100644
--- a/Elwig/Helpers/Export/Ebics.cs
+++ b/Elwig/Helpers/Export/Ebics.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers.Billing;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Elwig/Helpers/IAddress.cs b/Elwig/Helpers/IAddress.cs
index c4e35ef..75d8de6 100644
--- a/Elwig/Helpers/IAddress.cs
+++ b/Elwig/Helpers/IAddress.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public interface IAddress {
diff --git a/Elwig/Helpers/Utils.cs b/Elwig/Helpers/Utils.cs
index a5dcd06..4ed104d 100644
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@@ -10,7 +10,7 @@ using System.Net.Sockets;
 using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
diff --git a/Elwig/Helpers/Validator.cs b/Elwig/Helpers/Validator.cs
index 2874f78..99173ca 100644
--- a/Elwig/Helpers/Validator.cs
+++ b/Elwig/Helpers/Validator.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public static class Validator {
diff --git a/Elwig/Models/AT_Gem.cs b/Elwig/Models/Entities/AT_Gem.cs
similarity index 93%
rename from Elwig/Models/AT_Gem.cs
rename to Elwig/Models/Entities/AT_Gem.cs
index 5bb1468..6e8d0b0 100644
--- a/Elwig/Models/AT_Gem.cs
+++ b/Elwig/Models/Entities/AT_Gem.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_gem"), PrimaryKey("Gkz")]
     public class AT_Gem {
         [Column("gkz")]
diff --git a/Elwig/Models/AT_Kg.cs b/Elwig/Models/Entities/AT_Kg.cs
similarity index 94%
rename from Elwig/Models/AT_Kg.cs
rename to Elwig/Models/Entities/AT_Kg.cs
index df52ae3..fd96035 100644
--- a/Elwig/Models/AT_Kg.cs
+++ b/Elwig/Models/Entities/AT_Kg.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_kg"), PrimaryKey("KgNr")]
     public class AT_Kg {
         [Column("kgnr")]
diff --git a/Elwig/Models/AT_Ort.cs b/Elwig/Models/Entities/AT_Ort.cs
similarity index 94%
rename from Elwig/Models/AT_Ort.cs
rename to Elwig/Models/Entities/AT_Ort.cs
index 69cdc85..fc7829b 100644
--- a/Elwig/Models/AT_Ort.cs
+++ b/Elwig/Models/Entities/AT_Ort.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_ort"), PrimaryKey("Okz")]
     public class AT_Ort {
         [Column("okz")]
diff --git a/Elwig/Models/AT_Plz.cs b/Elwig/Models/Entities/AT_Plz.cs
similarity index 96%
rename from Elwig/Models/AT_Plz.cs
rename to Elwig/Models/Entities/AT_Plz.cs
index d04c465..5d00e81 100644
--- a/Elwig/Models/AT_Plz.cs
+++ b/Elwig/Models/Entities/AT_Plz.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz"), PrimaryKey("Plz")]
     public class AT_Plz {
         [Column("plz")]
diff --git a/Elwig/Models/AT_PlzDest.cs b/Elwig/Models/Entities/AT_PlzDest.cs
similarity index 96%
rename from Elwig/Models/AT_PlzDest.cs
rename to Elwig/Models/Entities/AT_PlzDest.cs
index bd6b04a..9c618d7 100644
--- a/Elwig/Models/AT_PlzDest.cs
+++ b/Elwig/Models/Entities/AT_PlzDest.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]
     public class AT_PlzDest {
         [Column("plz")]
diff --git a/Elwig/Models/AreaCom.cs b/Elwig/Models/Entities/AreaCom.cs
similarity index 97%
rename from Elwig/Models/AreaCom.cs
rename to Elwig/Models/Entities/AreaCom.cs
index c03f54b..a358b97 100644
--- a/Elwig/Models/AreaCom.cs
+++ b/Elwig/Models/Entities/AreaCom.cs
@@ -1,11 +1,10 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("area_commitment"), PrimaryKey("FbNr")]
     public class AreaCom {
         [Column("fbnr")]
diff --git a/Elwig/Models/AreaComType.cs b/Elwig/Models/Entities/AreaComType.cs
similarity index 98%
rename from Elwig/Models/AreaComType.cs
rename to Elwig/Models/Entities/AreaComType.cs
index 70f2e56..cadd183 100644
--- a/Elwig/Models/AreaComType.cs
+++ b/Elwig/Models/Entities/AreaComType.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
     public class AreaComType {
         [Column("vtrgid")]
diff --git a/Elwig/Models/BillingAddr.cs b/Elwig/Models/Entities/BillingAddr.cs
similarity index 96%
rename from Elwig/Models/BillingAddr.cs
rename to Elwig/Models/Entities/BillingAddr.cs
index 42e69d2..2ceca41 100644
--- a/Elwig/Models/BillingAddr.cs
+++ b/Elwig/Models/Entities/BillingAddr.cs
@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_billing_address"), PrimaryKey("MgNr")]
     public class BillingAddr : IAddress {
         [Column("mgnr")]
diff --git a/Elwig/Models/Branch.cs b/Elwig/Models/Entities/Branch.cs
similarity index 97%
rename from Elwig/Models/Branch.cs
rename to Elwig/Models/Entities/Branch.cs
index 7eb2534..81d5c7c 100644
--- a/Elwig/Models/Branch.cs
+++ b/Elwig/Models/Entities/Branch.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]
diff --git a/Elwig/Models/ClientParam.cs b/Elwig/Models/Entities/ClientParam.cs
similarity index 90%
rename from Elwig/Models/ClientParam.cs
rename to Elwig/Models/Entities/ClientParam.cs
index 24fad27..c9414a6 100644
--- a/Elwig/Models/ClientParam.cs
+++ b/Elwig/Models/Entities/ClientParam.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("client_parameter"), PrimaryKey("Param")]
     public class ClientParam {
         [Column("param")]
diff --git a/Elwig/Models/Country.cs b/Elwig/Models/Entities/Country.cs
similarity index 95%
rename from Elwig/Models/Country.cs
rename to Elwig/Models/Entities/Country.cs
index 564cd53..73756fb 100644
--- a/Elwig/Models/Country.cs
+++ b/Elwig/Models/Entities/Country.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]
     public class Country {
         [Column("num")]
diff --git a/Elwig/Models/Credit.cs b/Elwig/Models/Entities/Credit.cs
similarity index 99%
rename from Elwig/Models/Credit.cs
rename to Elwig/Models/Entities/Credit.cs
index cae904a..91dd1eb 100644
--- a/Elwig/Models/Credit.cs
+++ b/Elwig/Models/Entities/Credit.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]
     public class Credit {
         [Column("year")]
diff --git a/Elwig/Models/Currency.cs b/Elwig/Models/Entities/Currency.cs
similarity index 94%
rename from Elwig/Models/Currency.cs
rename to Elwig/Models/Entities/Currency.cs
index a28bc64..a7f809c 100644
--- a/Elwig/Models/Currency.cs
+++ b/Elwig/Models/Entities/Currency.cs
@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("currency"), PrimaryKey("Code")]
     public class Currency {
         [Column("code")]
diff --git a/Elwig/Models/Delivery.cs b/Elwig/Models/Entities/Delivery.cs
similarity index 98%
rename from Elwig/Models/Delivery.cs
rename to Elwig/Models/Entities/Delivery.cs
index 44f8548..f7721a5 100644
--- a/Elwig/Models/Delivery.cs
+++ b/Elwig/Models/Entities/Delivery.cs
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]
     public class Delivery {
         [Column("year")]
diff --git a/Elwig/Models/DeliveryPart.cs b/Elwig/Models/Entities/DeliveryPart.cs
similarity index 99%
rename from Elwig/Models/DeliveryPart.cs
rename to Elwig/Models/Entities/DeliveryPart.cs
index 702e7ce..ff70671 100644
--- a/Elwig/Models/DeliveryPart.cs
+++ b/Elwig/Models/Entities/DeliveryPart.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
     public class DeliveryPart {
         [Column("year")]
diff --git a/Elwig/Models/DeliveryPartBucket.cs b/Elwig/Models/Entities/DeliveryPartBucket.cs
similarity index 95%
rename from Elwig/Models/DeliveryPartBucket.cs
rename to Elwig/Models/Entities/DeliveryPartBucket.cs
index 6f0446f..f53f704 100644
--- a/Elwig/Models/DeliveryPartBucket.cs
+++ b/Elwig/Models/Entities/DeliveryPartBucket.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr")]
     public class DeliveryPartBucket {
         [Column("year")]
diff --git a/Elwig/Models/DeliveryPartModifier.cs b/Elwig/Models/Entities/DeliveryPartModifier.cs
similarity index 95%
rename from Elwig/Models/DeliveryPartModifier.cs
rename to Elwig/Models/Entities/DeliveryPartModifier.cs
index 0718afd..50e116f 100644
--- a/Elwig/Models/DeliveryPartModifier.cs
+++ b/Elwig/Models/Entities/DeliveryPartModifier.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part_modifier"), PrimaryKey("Year", "DId", "DPNr", "ModId")]
     public class DeliveryPartModifier {
         [Column("year")]
diff --git a/Elwig/Models/Member.cs b/Elwig/Models/Entities/Member.cs
similarity index 99%
rename from Elwig/Models/Member.cs
rename to Elwig/Models/Entities/Member.cs
index 1220fef..08085ba 100644
--- a/Elwig/Models/Member.cs
+++ b/Elwig/Models/Entities/Member.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member"), PrimaryKey("MgNr")]
     public class Member : IAddress {
         [Column("mgnr")]
diff --git a/Elwig/Models/MemberEmailAddr.cs b/Elwig/Models/Entities/MemberEmailAddr.cs
similarity index 94%
rename from Elwig/Models/MemberEmailAddr.cs
rename to Elwig/Models/Entities/MemberEmailAddr.cs
index b1aa355..7b96db9 100644
--- a/Elwig/Models/MemberEmailAddr.cs
+++ b/Elwig/Models/Entities/MemberEmailAddr.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_email_address"), PrimaryKey("MgNr", "Nr")]
     public class MemberEmailAddr {
         [Column("mgnr")]
diff --git a/Elwig/Models/MemberTelNr.cs b/Elwig/Models/Entities/MemberTelNr.cs
similarity index 94%
rename from Elwig/Models/MemberTelNr.cs
rename to Elwig/Models/Entities/MemberTelNr.cs
index 430e44b..dbcddb7 100644
--- a/Elwig/Models/MemberTelNr.cs
+++ b/Elwig/Models/Entities/MemberTelNr.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_telephone_number"), PrimaryKey("MgNr", "Nr")]
     public class MemberTelNr {
         [Column("mgnr")]
diff --git a/Elwig/Models/Modifier.cs b/Elwig/Models/Entities/Modifier.cs
similarity index 98%
rename from Elwig/Models/Modifier.cs
rename to Elwig/Models/Entities/Modifier.cs
index 6b33ada..9261124 100644
--- a/Elwig/Models/Modifier.cs
+++ b/Elwig/Models/Entities/Modifier.cs
@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("modifier"), PrimaryKey("Year", "ModId")]
     public class Modifier {
         [Column("year")]
diff --git a/Elwig/Models/PaymentDeliveryPart.cs b/Elwig/Models/Entities/PaymentDeliveryPart.cs
similarity index 97%
rename from Elwig/Models/PaymentDeliveryPart.cs
rename to Elwig/Models/Entities/PaymentDeliveryPart.cs
index a6db7a2..d2852ef 100644
--- a/Elwig/Models/PaymentDeliveryPart.cs
+++ b/Elwig/Models/Entities/PaymentDeliveryPart.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
     public class PaymentDeliveryPart {
         [Column("year")]
diff --git a/Elwig/Models/PaymentDeliveryPartBucket.cs b/Elwig/Models/Entities/PaymentDeliveryPartBucket.cs
similarity index 97%
rename from Elwig/Models/PaymentDeliveryPartBucket.cs
rename to Elwig/Models/Entities/PaymentDeliveryPartBucket.cs
index ea53b6f..03cb15e 100644
--- a/Elwig/Models/PaymentDeliveryPartBucket.cs
+++ b/Elwig/Models/Entities/PaymentDeliveryPartBucket.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr", "AvNr")]
     public class PaymentDeliveryPartBucket {
         [Column("year")]
diff --git a/Elwig/Models/PaymentMember.cs b/Elwig/Models/Entities/PaymentMember.cs
similarity index 96%
rename from Elwig/Models/PaymentMember.cs
rename to Elwig/Models/Entities/PaymentMember.cs
index 331fea4..063cc86 100644
--- a/Elwig/Models/PaymentMember.cs
+++ b/Elwig/Models/Entities/PaymentMember.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_member"), PrimaryKey("Year", "AvNr", "MgNr")]
     public class PaymentMember {
         [Column("year")]
diff --git a/Elwig/Models/PaymentVar.cs b/Elwig/Models/Entities/PaymentVar.cs
similarity index 97%
rename from Elwig/Models/PaymentVar.cs
rename to Elwig/Models/Entities/PaymentVar.cs
index 49fbaeb..3e14733 100644
--- a/Elwig/Models/PaymentVar.cs
+++ b/Elwig/Models/Entities/PaymentVar.cs
@@ -2,9 +2,8 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_variant"), PrimaryKey("Year", "AvNr")]
     public class PaymentVar {
         [Column("year")]
diff --git a/Elwig/Models/PostalDest.cs b/Elwig/Models/Entities/PostalDest.cs
similarity index 93%
rename from Elwig/Models/PostalDest.cs
rename to Elwig/Models/Entities/PostalDest.cs
index 82374f1..d350a12 100644
--- a/Elwig/Models/PostalDest.cs
+++ b/Elwig/Models/Entities/PostalDest.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("postal_dest"), PrimaryKey("CountryNum", "Id")]
     public class PostalDest {
         [Column("country")]
diff --git a/Elwig/Models/Season.cs b/Elwig/Models/Entities/Season.cs
similarity index 98%
rename from Elwig/Models/Season.cs
rename to Elwig/Models/Entities/Season.cs
index e9bbae4..35a995f 100644
--- a/Elwig/Models/Season.cs
+++ b/Elwig/Models/Entities/Season.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("season"), PrimaryKey("Year")]
     public class Season {
         [Column("year")]
diff --git a/Elwig/Models/WbGem.cs b/Elwig/Models/Entities/WbGem.cs
similarity index 93%
rename from Elwig/Models/WbGem.cs
rename to Elwig/Models/Entities/WbGem.cs
index 82b2884..7e49707 100644
--- a/Elwig/Models/WbGem.cs
+++ b/Elwig/Models/Entities/WbGem.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_gem"), PrimaryKey("Gkz")]
     public class WbGem {
         [Column("gkz")]
diff --git a/Elwig/Models/WbGl.cs b/Elwig/Models/Entities/WbGl.cs
similarity index 92%
rename from Elwig/Models/WbGl.cs
rename to Elwig/Models/Entities/WbGl.cs
index 00496e3..56446ee 100644
--- a/Elwig/Models/WbGl.cs
+++ b/Elwig/Models/Entities/WbGl.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_gl"), PrimaryKey("GlNr")]
     public class WbGl {
         [Column("glnr")]
diff --git a/Elwig/Models/WbKg.cs b/Elwig/Models/Entities/WbKg.cs
similarity index 95%
rename from Elwig/Models/WbKg.cs
rename to Elwig/Models/Entities/WbKg.cs
index 138e8bf..9cfe6dd 100644
--- a/Elwig/Models/WbKg.cs
+++ b/Elwig/Models/Entities/WbKg.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_kg"), PrimaryKey("KgNr")]
     public class WbKg {
         [Column("kgnr")]
diff --git a/Elwig/Models/WbRd.cs b/Elwig/Models/Entities/WbRd.cs
similarity index 93%
rename from Elwig/Models/WbRd.cs
rename to Elwig/Models/Entities/WbRd.cs
index 378287e..fec0df5 100644
--- a/Elwig/Models/WbRd.cs
+++ b/Elwig/Models/Entities/WbRd.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_rd"), PrimaryKey("KgNr", "RdNr")]
     public class WbRd {
         [Column("kgnr")]
diff --git a/Elwig/Models/WineAttr.cs b/Elwig/Models/Entities/WineAttr.cs
similarity index 95%
rename from Elwig/Models/WineAttr.cs
rename to Elwig/Models/Entities/WineAttr.cs
index a4f16dd..b074794 100644
--- a/Elwig/Models/WineAttr.cs
+++ b/Elwig/Models/Entities/WineAttr.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_attribute"), PrimaryKey("AttrId"), Index("Name", IsUnique = true)]
     public class WineAttr {
         [Column("attrid")]
diff --git a/Elwig/Models/WineCult.cs b/Elwig/Models/Entities/WineCult.cs
similarity index 93%
rename from Elwig/Models/WineCult.cs
rename to Elwig/Models/Entities/WineCult.cs
index eeb1341..064ef03 100644
--- a/Elwig/Models/WineCult.cs
+++ b/Elwig/Models/Entities/WineCult.cs
@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_cultivation"), PrimaryKey("CultId"), Index("Name", IsUnique = true)]
     public class WineCult {
         [Column("cultid")]
diff --git a/Elwig/Models/WineOrigin.cs b/Elwig/Models/Entities/WineOrigin.cs
similarity index 97%
rename from Elwig/Models/WineOrigin.cs
rename to Elwig/Models/Entities/WineOrigin.cs
index 4291146..a82fea9 100644
--- a/Elwig/Models/WineOrigin.cs
+++ b/Elwig/Models/Entities/WineOrigin.cs
@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]
     public class WineOrigin {
         [Column("hkid")]
diff --git a/Elwig/Models/WineQualLevel.cs b/Elwig/Models/Entities/WineQualLevel.cs
similarity index 93%
rename from Elwig/Models/WineQualLevel.cs
rename to Elwig/Models/Entities/WineQualLevel.cs
index 9609f9d..a0bda18 100644
--- a/Elwig/Models/WineQualLevel.cs
+++ b/Elwig/Models/Entities/WineQualLevel.cs
@@ -2,10 +2,8 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Configuration;
-using System.Security.Cryptography.Pkcs;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_quality_level"), PrimaryKey("QualId")]
     public class WineQualLevel : IEquatable<WineQualLevel> {
         [Column("qualid")]
diff --git a/Elwig/Models/WineVar.cs b/Elwig/Models/Entities/WineVar.cs
similarity index 95%
rename from Elwig/Models/WineVar.cs
rename to Elwig/Models/Entities/WineVar.cs
index fe34151..5cfab14 100644
--- a/Elwig/Models/WineVar.cs
+++ b/Elwig/Models/Entities/WineVar.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
     public class WineVar {
         [Column("sortid")]
diff --git a/Elwig/Windows/AdministrationWindow.cs b/Elwig/Windows/AdministrationWindow.cs
index 87cf652..ad899e5 100644
--- a/Elwig/Windows/AdministrationWindow.cs
+++ b/Elwig/Windows/AdministrationWindow.cs
@@ -1,6 +1,6 @@
 using Elwig.Controls;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/Elwig/Windows/AreaComAdminWindow.xaml.cs b/Elwig/Windows/AreaComAdminWindow.xaml.cs
index 6216654..bb0e959 100644
--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@@ -3,13 +3,12 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Xceed.Wpf.Toolkit.Primitives;
-using System.Runtime.Intrinsics.Arm;
 
 namespace Elwig.Windows {
     public partial class AreaComAdminWindow : AdministrationWindow {
diff --git a/Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs b/Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs
index 4a38111..503ada2 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.Branch.cs b/Elwig/Windows/BaseDataWindow.xaml.Branch.cs
index 06904a0..d03b8c3 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.Branch.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Branch.cs
@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Controls;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.Mod.cs b/Elwig/Windows/BaseDataWindow.xaml.Mod.cs
index 34d41a1..31193eb 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.Mod.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Mod.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.Season.cs b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
index ff6fdd4..f1ceb6f 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs b/Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs
index c53fbaa..b21dd48 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.WineCult.cs b/Elwig/Windows/BaseDataWindow.xaml.WineCult.cs
index d54fb9e..caa3bdb 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.WineCult.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.WineCult.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Elwig/Windows/BaseDataWindow.xaml.cs b/Elwig/Windows/BaseDataWindow.xaml.cs
index c1d5ddd..ce52652 100644
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
diff --git a/Elwig/Windows/ChartWindow.xaml.cs b/Elwig/Windows/ChartWindow.xaml.cs
index a11fd83..9833b79 100644
--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@@ -9,7 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using ScottPlot;
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 24b2c8e..d266e16 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
diff --git a/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs
index e170610..20cd128 100644
--- a/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Elwig.Documents;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Elwig.Windows;
 using Microsoft.EntityFrameworkCore;
 using System;
diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs
index 0aa2fca..90ae7d1 100644
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -6,7 +6,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;