diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
new file mode 100644
index 0000000000000000000000000000000000000000..2674807ccb21c8e030114337c62905202ae31b93
--- /dev/null
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/Converter.java
@@ -0,0 +1,6 @@
+package de.deadlocker8.budgetmaster.database;
+
+public interface Converter<T, S>
+{
+	T convert(S backupItem);
+}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
index 7e2ba2b50d9f3bcf8e1ec4160f20f19ae7741718..e796b16f9fbee6cbcab6dfc903f28367935edb54 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v5.java
@@ -1,23 +1,12 @@
 package de.deadlocker8.budgetmaster.database;
 
 import com.google.gson.*;
-import de.deadlocker8.budgetmaster.accounts.AccountState;
-import de.deadlocker8.budgetmaster.accounts.AccountType;
 import de.deadlocker8.budgetmaster.database.model.v5.*;
-import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
-import de.deadlocker8.budgetmaster.repeating.endoption.*;
-import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
-import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
-import de.deadlocker8.budgetmaster.tags.Tag;
-import de.thecodelabs.utils.util.Localization;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class DatabaseParser_v5
 {
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 052bb4a374c76805fd95cccec5c948da001afed1..fb021d62b532f62b11a26bcc21df83b709679091 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,6 +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.Database;
 import de.deadlocker8.budgetmaster.database.model.v5.converter.*;
 import de.deadlocker8.budgetmaster.images.Image;
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 50318cff31ba5e44590e06b6237e82fa48620c54..5895f4bc97d53200c7fa2005534f70986d47f73d 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,6 +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.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 b11cc2571f53b940addffcac6a40822ab552be0a..ebb5cf048d84cbea1e87924860b1737adc1f5626 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,6 +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.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 cc8954ceefc3c66a4d1b90d85eb70adf4062bc51..4e616eedcd54b61e17285cc22528333c7942f35d 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,6 +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.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/Converter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/Converter.java
deleted file mode 100644
index 55b387749ac12d270d808d295057637349007a14..0000000000000000000000000000000000000000
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/converter/Converter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.deadlocker8.budgetmaster.database.model.v5.converter;
-
-public interface Converter<T, S>
-{
-	T convert(S backupItem);
-}
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 1a2cb60fbd4fa0400269eb6f11eacf3dd536e790..8cefe6a24b7c49662e8f4e282926cc601d6af65d 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.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 013502f73e5db36a73291c0cb1578294f64bb036..69302b449de884ef059337d99c91666fa3321554 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingEndOption_v5;
 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 0d20e28af685438c973847cc60b40ab8f4a1e344..a02b433cc71e0834f462463af139f11b29cdc4e3 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingModifier_v5;
 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 9a494e3d413eeb2e5f8cecf0fa9336705d47f442..1e39e775b923ec300be62f026672f496ed89d2ad 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupRepeatingOption_v5;
 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 df8179feee2e11db00cc81f291bc73ad785ee803..e08d595753e7b2211b7d1c4ca56b3fa081d764bc 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.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 5949722a4cc5a4a3d478dccd7faa9e2d6de0c406..6de4af3cb9a307258f762ded39adeb6300315b4e 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,5 +1,6 @@
 package de.deadlocker8.budgetmaster.database.model.v5.converter;
 
+import de.deadlocker8.budgetmaster.database.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupTransaction_v5;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import org.joda.time.DateTime;