diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4511c9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.idea/
+out/
+*.iml
\ No newline at end of file
diff --git a/Besuch.java b/src/de/dhbw/contactdb/Besuch.java
similarity index 97%
rename from Besuch.java
rename to src/de/dhbw/contactdb/Besuch.java
index 9b013c3..85e8f6f 100644
--- a/Besuch.java
+++ b/src/de/dhbw/contactdb/Besuch.java
@@ -1,4 +1,4 @@
-package project;
+package de.dhbw.contactdb;
 
 import java.time.LocalDateTime;
 
diff --git a/Main.java b/src/de/dhbw/contactdb/Main.java
similarity index 96%
rename from Main.java
rename to src/de/dhbw/contactdb/Main.java
index 63f8b75..3f64f40 100644
--- a/Main.java
+++ b/src/de/dhbw/contactdb/Main.java
@@ -1,6 +1,6 @@
-package project;
+package de.dhbw.contactdb;
 
-import project.utils.Parser;
+import de.dhbw.contactdb.utils.Parser;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -16,7 +16,7 @@ public class Main {
     public static HashMap<Integer, Ort> orte = new HashMap<>();
 
     public static void main(String[] args) {
-        Parser.parse("/project/db/contacts2021.db");
+        Parser.parse("/de/dhbw/contactdb/db/contacts2021.db");
 
         if (args.length == 1) {
             if (args[0].contains("--personensuche")) {
@@ -83,6 +83,7 @@ public class Main {
                             });
                         } else {
                             // Outdoor
+                            // TODO
                         }
                     }
                 });
diff --git a/Ort.java b/src/de/dhbw/contactdb/Ort.java
similarity index 96%
rename from Ort.java
rename to src/de/dhbw/contactdb/Ort.java
index 3684f3b..fd4ce5e 100644
--- a/Ort.java
+++ b/src/de/dhbw/contactdb/Ort.java
@@ -1,4 +1,4 @@
-package project;
+package de.dhbw.contactdb;
 
 public class Ort {
     private int id;
diff --git a/Person.java b/src/de/dhbw/contactdb/Person.java
similarity index 95%
rename from Person.java
rename to src/de/dhbw/contactdb/Person.java
index b7f4a7d..554f82e 100644
--- a/Person.java
+++ b/src/de/dhbw/contactdb/Person.java
@@ -1,4 +1,4 @@
-package project;
+package de.dhbw.contactdb;
 
 public class Person {
     private int id;
diff --git a/db/contacts2021.db b/src/de/dhbw/contactdb/db/contacts2021.db
similarity index 100%
rename from db/contacts2021.db
rename to src/de/dhbw/contactdb/db/contacts2021.db
diff --git a/utils/Parser.java b/src/de/dhbw/contactdb/utils/Parser.java
similarity index 85%
rename from utils/Parser.java
rename to src/de/dhbw/contactdb/utils/Parser.java
index 69a4808..fc76d14 100644
--- a/utils/Parser.java
+++ b/src/de/dhbw/contactdb/utils/Parser.java
@@ -1,22 +1,29 @@
-package project.utils;
+package de.dhbw.contactdb.utils;
 
-import project.Besuch;
-import project.Main;
-import project.Ort;
-import project.Person;
+import de.dhbw.contactdb.Besuch;
+import de.dhbw.contactdb.Main;
+import de.dhbw.contactdb.Ort;
+import de.dhbw.contactdb.Person;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Objects;
 
 public class Parser {
     private static db_new_entity new_entity = null;
 
     public static void parse(String filename) {
-        try (BufferedReader bf = new BufferedReader(new InputStreamReader(Objects.requireNonNull(Main.class.getResourceAsStream(filename))))) {
+        InputStream db = Main.class.getResourceAsStream(filename);
+
+        if(db == null) {
+            System.err.println("Cannot find database!");
+            System.exit(-1);
+        }
+
+        try (BufferedReader bf = new BufferedReader(new InputStreamReader(db))) {
             String line;
             while ((line = bf.readLine()) != null) {
                 if (line.toLowerCase().contains("new_entity")) {
diff --git a/utils/db_new_entity.java b/src/de/dhbw/contactdb/utils/db_new_entity.java
similarity index 62%
rename from utils/db_new_entity.java
rename to src/de/dhbw/contactdb/utils/db_new_entity.java
index 6f957f8..c5df952 100644
--- a/utils/db_new_entity.java
+++ b/src/de/dhbw/contactdb/utils/db_new_entity.java
@@ -1,4 +1,4 @@
-package project.utils;
+package de.dhbw.contactdb.utils;
 
 public enum db_new_entity {
     PERSON, ORT, BESUCH