diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
similarity index 55%
rename from src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
index 2674807ccb21c8e030114337c62905202ae31b93..7f3f95f5a800db5409be610105aa862cc1cf287d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/Converter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database;
+package de.deadlocker8.budgetmaster.database.model;
 
 public interface Converter<T, S>
 {
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
index 5190cf1c7ada26409d53cba8c199ec7de1a4e467..7990eecc2a8175c32078dff7244551653a06930c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
@@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.database.model.v5;
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.categories.Category;
 import de.deadlocker8.budgetmaster.charts.Chart;
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.Database;
 import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
 import de.deadlocker8.budgetmaster.database.model.v5.converter.*;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java
index 5895f4bc97d53200c7fa2005534f70986d47f73d..c6d186fb13379c9283b19bbdb053511b18b6114f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/AccountConverter_v5.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.accounts.Account;
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupAccount_v5;
 
 public class AccountConverter_v5 implements Converter<Account, BackupAccount_v5>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java
index ebb5cf048d84cbea1e87924860b1737adc1f5626..9bafb1a99dd9ba43b33bfb99e06727da9fd7c580 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/CategoryConverter_v5.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.categories.Category;
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupCategory_v5;
 
 public class CategoryConverter_v5 implements Converter<Category, BackupCategory_v5>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java
index 4e616eedcd54b61e17285cc22528333c7942f35d..ace95af05a8de2ff9a66e0f71f2d50b5d1b825a0 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ChartConverter_v5.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
 import de.deadlocker8.budgetmaster.charts.Chart;
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupChart_v5;
 
 public class ChartConverter_v5 implements Converter<Chart, BackupChart_v5>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java
index 8cefe6a24b7c49662e8f4e282926cc601d6af65d..3c12b486c8d268039348aa4091d63c65d9010b47 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/ImageConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
 import de.deadlocker8.budgetmaster.images.Image;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java
index 6056b212d4651be4d497937b092a8d5b9f2158da..d9aa740a4a39c7193cfbd1b917b760be2668f1f4 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingEndOptionConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4;
 import de.deadlocker8.budgetmaster.repeating.endoption.*;
 import de.thecodelabs.utils.util.Localization;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java
index e7e33f490706292f7efa872ff44a708f515dfcff..df92e20d68735a450cd12141049506d8c881e537 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingModifierConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java
index 0afbeac7206644fb5b162d639c3df6c1bd42ae81..54574286ee3128c739a8100c4c82be96c77e636a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/RepeatingOptionConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
 import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
 import org.joda.time.DateTime;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java
index e08d595753e7b2211b7d1c4ca56b3fa081d764bc..59cb66e7641a35ea287e663dfd26c175f0a34714 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TemplateConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupTemplate_v5;
 import de.deadlocker8.budgetmaster.templates.Template;
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java
index 6de4af3cb9a307258f762ded39adeb6300315b4e..fc65eeea9cd42916f00ecf677d52b7f75ac043f7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/TransactionConverter_v5.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
-import de.deadlocker8.budgetmaster.database.Converter;
+import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupTransaction_v5;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import org.joda.time.DateTime;