diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index d7fb0ad..25de883 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/patient/PatientDao.java" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java" dialect="GenericSQL" />
     <file url="PROJECT" dialect="SQLite" />
   </component>
 </project>
\ No newline at end of file
diff --git a/db/nursingHome.db b/db/nursingHome.db
index fbd0833..f808c14 100644
Binary files a/db/nursingHome.db and b/db/nursingHome.db differ
diff --git a/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java b/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
index 063e29f..06d208f 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
+++ b/src/main/java/de/hitec/nhplus/datastorage/DaoFactory.java
@@ -1,5 +1,8 @@
 package de.hitec.nhplus.datastorage;
 
+import de.hitec.nhplus.patient.PatientDao;
+import de.hitec.nhplus.treatment.TreatmentDao;
+
 public class DaoFactory {
 
     private static DaoFactory instance;
diff --git a/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java b/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
index 6643f1e..b497164 100644
--- a/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
+++ b/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
@@ -1,7 +1,7 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.ConnectionBuilder;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.Patient;
 
 import java.sql.Connection;
 import java.util.Map;
diff --git a/src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java b/src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java
index d4574ee..739058d 100644
--- a/src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java
+++ b/src/main/java/de/hitec/nhplus/fixtures/PatientFixture.java
@@ -1,8 +1,8 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.patient.PatientDao;
+import de.hitec.nhplus.patient.Patient;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java b/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
index bf2f589..e6bf5ad 100644
--- a/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
+++ b/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
@@ -1,9 +1,9 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.treatment.TreatmentDao;
+import de.hitec.nhplus.patient.Patient;
+import de.hitec.nhplus.treatment.Treatment;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/de/hitec/nhplus/controller/MainWindowController.java b/src/main/java/de/hitec/nhplus/main/MainWindowController.java
similarity index 96%
rename from src/main/java/de/hitec/nhplus/controller/MainWindowController.java
rename to src/main/java/de/hitec/nhplus/main/MainWindowController.java
index 862380d..00f1f40 100644
--- a/src/main/java/de/hitec/nhplus/controller/MainWindowController.java
+++ b/src/main/java/de/hitec/nhplus/main/MainWindowController.java
@@ -1,4 +1,4 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.main;
 
 import de.hitec.nhplus.Main;
 import javafx.event.ActionEvent;
diff --git a/src/main/java/de/hitec/nhplus/model/Person.java b/src/main/java/de/hitec/nhplus/main/Person.java
similarity index 96%
rename from src/main/java/de/hitec/nhplus/model/Person.java
rename to src/main/java/de/hitec/nhplus/main/Person.java
index d7f8f9b..ace9383 100644
--- a/src/main/java/de/hitec/nhplus/model/Person.java
+++ b/src/main/java/de/hitec/nhplus/main/Person.java
@@ -1,4 +1,4 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.main;
 
 import javafx.beans.property.SimpleStringProperty;
 
diff --git a/src/main/java/de/hitec/nhplus/controller/AllPatientController.java b/src/main/java/de/hitec/nhplus/patient/AllPatientController.java
similarity index 98%
rename from src/main/java/de/hitec/nhplus/controller/AllPatientController.java
rename to src/main/java/de/hitec/nhplus/patient/AllPatientController.java
index bdd5f92..d853c72 100644
--- a/src/main/java/de/hitec/nhplus/controller/AllPatientController.java
+++ b/src/main/java/de/hitec/nhplus/patient/AllPatientController.java
@@ -1,8 +1,6 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.patient;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.model.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
diff --git a/src/main/java/de/hitec/nhplus/model/Patient.java b/src/main/java/de/hitec/nhplus/patient/Patient.java
similarity index 97%
rename from src/main/java/de/hitec/nhplus/model/Patient.java
rename to src/main/java/de/hitec/nhplus/patient/Patient.java
index 43d6d8f..26e95fd 100644
--- a/src/main/java/de/hitec/nhplus/model/Patient.java
+++ b/src/main/java/de/hitec/nhplus/patient/Patient.java
@@ -1,5 +1,7 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.patient;
 
+import de.hitec.nhplus.main.Person;
+import de.hitec.nhplus.treatment.Treatment;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/de/hitec/nhplus/datastorage/PatientDao.java b/src/main/java/de/hitec/nhplus/patient/PatientDao.java
similarity index 98%
rename from src/main/java/de/hitec/nhplus/datastorage/PatientDao.java
rename to src/main/java/de/hitec/nhplus/patient/PatientDao.java
index 803286b..0d5c315 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/PatientDao.java
+++ b/src/main/java/de/hitec/nhplus/patient/PatientDao.java
@@ -1,6 +1,7 @@
-package de.hitec.nhplus.datastorage;
+package de.hitec.nhplus.patient;
 
-import de.hitec.nhplus.model.Patient;
+import de.hitec.nhplus.datastorage.DaoImp;
+import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.*;
diff --git a/src/main/java/de/hitec/nhplus/controller/AllTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
similarity index 97%
rename from src/main/java/de/hitec/nhplus/controller/AllTreatmentController.java
rename to src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
index b0ec78f..a1ef777 100644
--- a/src/main/java/de/hitec/nhplus/controller/AllTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
@@ -1,11 +1,9 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.datastorage.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.patient.PatientDao;
+import de.hitec.nhplus.patient.Patient;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
diff --git a/src/main/java/de/hitec/nhplus/controller/NewTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/NewTreatmentController.java
similarity index 96%
rename from src/main/java/de/hitec/nhplus/controller/NewTreatmentController.java
rename to src/main/java/de/hitec/nhplus/treatment/NewTreatmentController.java
index d1500cd..466dc76 100644
--- a/src/main/java/de/hitec/nhplus/controller/NewTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/NewTreatmentController.java
@@ -1,9 +1,7 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.TreatmentDao;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
diff --git a/src/main/java/de/hitec/nhplus/model/Treatment.java b/src/main/java/de/hitec/nhplus/treatment/Treatment.java
similarity index 99%
rename from src/main/java/de/hitec/nhplus/model/Treatment.java
rename to src/main/java/de/hitec/nhplus/treatment/Treatment.java
index e4eea2c..7270ada 100644
--- a/src/main/java/de/hitec/nhplus/model/Treatment.java
+++ b/src/main/java/de/hitec/nhplus/treatment/Treatment.java
@@ -1,4 +1,4 @@
-package de.hitec.nhplus.model;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.utils.DateConverter;
 
diff --git a/src/main/java/de/hitec/nhplus/controller/TreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/TreatmentController.java
similarity index 94%
rename from src/main/java/de/hitec/nhplus/controller/TreatmentController.java
rename to src/main/java/de/hitec/nhplus/treatment/TreatmentController.java
index f29e0b8..a3fe6ce 100644
--- a/src/main/java/de/hitec/nhplus/controller/TreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/TreatmentController.java
@@ -1,13 +1,11 @@
-package de.hitec.nhplus.controller;
+package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
-import de.hitec.nhplus.datastorage.PatientDao;
-import de.hitec.nhplus.datastorage.TreatmentDao;
+import de.hitec.nhplus.patient.PatientDao;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.stage.Stage;
-import de.hitec.nhplus.model.Patient;
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.SQLException;
diff --git a/src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java b/src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java
similarity index 99%
rename from src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java
rename to src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java
index 64261c0..fd2b375 100644
--- a/src/main/java/de/hitec/nhplus/datastorage/TreatmentDao.java
+++ b/src/main/java/de/hitec/nhplus/treatment/TreatmentDao.java
@@ -1,6 +1,6 @@
-package de.hitec.nhplus.datastorage;
+package de.hitec.nhplus.treatment;
 
-import de.hitec.nhplus.model.Treatment;
+import de.hitec.nhplus.datastorage.DaoImp;
 import de.hitec.nhplus.utils.DateConverter;
 
 import java.sql.*;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 8c591d3..6435187 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,16 +1,19 @@
 module de.hitec.nhplus {
     requires javafx.controls;
     requires javafx.fxml;
-
     requires org.controlsfx.controls;
     requires java.sql;
     requires org.xerial.sqlitejdbc;
 
-    opens de.hitec.nhplus to javafx.fxml;
-    opens de.hitec.nhplus.controller to javafx.fxml;
-    opens de.hitec.nhplus.model to javafx.base;
-
     exports de.hitec.nhplus;
-    exports de.hitec.nhplus.controller;
-    exports de.hitec.nhplus.model;
+    opens de.hitec.nhplus to javafx.fxml;
+
+    exports de.hitec.nhplus.main;
+    opens de.hitec.nhplus.main to javafx.base, javafx.fxml;
+
+    exports de.hitec.nhplus.patient;
+    opens de.hitec.nhplus.patient to javafx.base, javafx.fxml;
+
+    exports de.hitec.nhplus.treatment;
+    opens de.hitec.nhplus.treatment to javafx.base, javafx.fxml;
 }
diff --git a/src/main/resources/de/hitec/nhplus/AllPatientView.fxml b/src/main/resources/de/hitec/nhplus/AllPatientView.fxml
index 8b93fd1..6a189ed 100644
--- a/src/main/resources/de/hitec/nhplus/AllPatientView.fxml
+++ b/src/main/resources/de/hitec/nhplus/AllPatientView.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.AllPatientController">
+<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.patient.AllPatientController">
    <children>
       <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="120.0" prefHeight="287.0" prefWidth="825.0" AnchorPane.bottomAnchor="100.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
         <columns>
diff --git a/src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml
index 05dce2b..c62332f 100644
--- a/src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/AllTreatmentView.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.AllTreatmentController">
+<AnchorPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.AllTreatmentController">
    <children>
       <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="35.0" onMouseClicked="#handleMouseClick" prefHeight="364.0" prefWidth="825.0" AnchorPane.bottomAnchor="75.0" AnchorPane.leftAnchor="15.0" AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="80.0">
         <columns>
diff --git a/src/main/resources/de/hitec/nhplus/MainWindowView.fxml b/src/main/resources/de/hitec/nhplus/MainWindowView.fxml
index 726b20f..83afde7 100644
--- a/src/main/resources/de/hitec/nhplus/MainWindowView.fxml
+++ b/src/main/resources/de/hitec/nhplus/MainWindowView.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<BorderPane fx:id="mainBorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="688.0" prefWidth="926.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.MainWindowController">
+<BorderPane fx:id="mainBorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="688.0" prefWidth="926.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.main.MainWindowController">
    <left>
       <VBox id="vBox" alignment="CENTER" spacing="50.0" styleClass="vBox" stylesheets="@Application.css" BorderPane.alignment="CENTER">
          <children>
diff --git a/src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml
index f541e86..0e14533 100644
--- a/src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/NewTreatmentView.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 <AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.NewTreatmentController">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.NewTreatmentController">
     <children>
         <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="5.0"
               AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
diff --git a/src/main/resources/de/hitec/nhplus/TreatmentView.fxml b/src/main/resources/de/hitec/nhplus/TreatmentView.fxml
index 7557147..de3c91b 100644
--- a/src/main/resources/de/hitec/nhplus/TreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/TreatmentView.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 <AnchorPane prefHeight="450.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.controller.TreatmentController">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.treatment.TreatmentController">
     <children>
         <HBox alignment="TOP_CENTER" prefWidth="200.0" spacing="25.0" AnchorPane.leftAnchor="15.0"
               AnchorPane.rightAnchor="15.0" AnchorPane.topAnchor="5.0">