diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
index 0310f11c640b870556fec5a42579fad844934baa..0c1d1c851de8171b562777ea0d4bfaebbb4c7a23 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/AccountConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/AccountConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
index d7050d2153382039e0211ff8ba3c1eb234fa605a..51c40bc0306a5e2b295c2b107bf6b7d2dd30a8f5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/CategoryConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CategoryConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.categories.Category;
 import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
index ba1dbcfcc0e01d4d30ca910d065af3ad1f2782f5..77525beb6d89e44b8a7337ab4ae65537598acc97 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ChartConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ChartConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.charts.Chart;
 import de.deadlocker8.budgetmaster.database.model.Converter;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
similarity index 93%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
index 78d5ba28fa088fa5f412d2decc21114770a4baee..22ce5df09dcca1650a05c31e971e3bc8df5d4573 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/ImageConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/ImageConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
index 6a816cdb9b7f519bcb34444e1fa0e6bbb9c90050..d4190ccfd5fdb7958b82efd4956365e29378c49f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingEndOptionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingEndOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingEndOption_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
similarity index 94%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
index 46cc40856888582c8e7a453ebfc0220b02770075..189a67ea75f75fdb7b6fe9856bf1ff11afb50bf7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingModifierConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingModifierConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingModifier_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
similarity index 96%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
index 9a88a97e7c6e7502eb1ef12a546b53882abfb650..06ab54dea48444a37afcfa9911b05a2968341da0 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/RepeatingOptionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/RepeatingOptionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupRepeatingOption_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
similarity index 89%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
index 4f58d16acb17bba3b16a6313f73b22f3f4639bc7..caf5a059924e5fcccb2fa8243e6206a96dff1520 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TagConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TagConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.database.model.Converter;
 import de.deadlocker8.budgetmaster.database.model.v4.BackupTag_v4;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
similarity index 98%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
index 2ffc20ebb706ea63a3fd346a54cfe7d2f0bbac01..f1374ae3d7c300ac0dd9e20e66282056662df7b4 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TemplateConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TemplateConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.categories.Category;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
similarity index 98%
rename from src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
index dcd06f5396b999cdc32bce07cdeb100ebaf103a6..d923ce5fe8c954f3104c7f496c8d951971f306f6 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/converter/TransactionConverter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/TransactionConverter.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmaster.database.model.v6.converter;
+package de.deadlocker8.budgetmaster.database.model.converter;
 
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.categories.Category;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
index 07ecdbeaab95b9c3efa07c2ba57fe0fa52d23a14..30dcf3b655c52a370416129b5def7af1e61d9ba0 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java
@@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupCategory_v5;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupChart_v5;
 import de.deadlocker8.budgetmaster.database.model.v5.BackupImage_v5;
-import de.deadlocker8.budgetmaster.database.model.v6.converter.*;
+import de.deadlocker8.budgetmaster.database.model.converter.*;
 import de.deadlocker8.budgetmaster.images.Image;
 import de.deadlocker8.budgetmaster.templates.Template;
 import de.deadlocker8.budgetmaster.transactions.Transaction;