diff --git a/src/de/deadlocker8/budgetmaster/logic/Settings.java b/src/de/deadlocker8/budgetmaster/logic/Settings.java
index 2d8612467f033bf9e64bd9972599a121509d5912..aede2c726d25b69783474169bc49176f810fa418 100644
--- a/src/de/deadlocker8/budgetmaster/logic/Settings.java
+++ b/src/de/deadlocker8/budgetmaster/logic/Settings.java
@@ -3,9 +3,21 @@ package de.deadlocker8.budgetmaster.logic;
 import java.util.ArrayList;
 
 import de.deadlocker8.budgetmaster.logic.utils.LanguageType;
+import de.deadlocker8.budgetmaster.logic.utils.SaveFileType;
 
 public class Settings
 {
+	/*
+	 * VERSIONS 
+	 * 
+	 * --> 1
+	 * initial
+	 * 
+	 */	
+	
+	@SuppressWarnings("unused")
+	private final String TYPE = SaveFileType.BUDGETMASTER_SETTINGS.toString();
+	private final int VERSION = 1;	
 	private String clientSecret;
 	private String url;
 	private String secret;
@@ -112,9 +124,15 @@ public class Settings
 		return true;
 	}
 
+	public int getVERSION()
+	{
+		return VERSION;
+	}
+
 	@Override
 	public String toString()
 	{
-		return "Settings [clientSecret=" + clientSecret + ", url=" + url + ", secret=" + secret + ", currency=" + currency + ", restActivated=" + restActivated + ", trustedHosts=" + trustedHosts + ", language=" + language + ", autoUpdateCheckEnabled=" + autoUpdateCheckEnabled + "]";
+		return "Settings [TYPE=" + TYPE + ", VERSION=" + VERSION + ", clientSecret=" + clientSecret + ", url=" + url + ", secret=" + secret + ", currency=" + currency + ", restActivated=" + restActivated + ", trustedHosts=" + trustedHosts + ", language=" + language + ", autoUpdateCheckEnabled="
+				+ autoUpdateCheckEnabled + "]";
 	}
 }
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportPreferences.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportPreferences.java
index fb97b91f759e19f2813e30bfdb87d5556ed50f8d..e358e1817d682a66006cc7c42033b9eace929272 100644
--- a/src/de/deadlocker8/budgetmaster/logic/report/ReportPreferences.java
+++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportPreferences.java
@@ -1,7 +1,21 @@
 package de.deadlocker8.budgetmaster.logic.report;
 
+import de.deadlocker8.budgetmaster.logic.utils.SaveFileType;
+
 public class ReportPreferences
 {
+	/*
+	 * VERSIONS 
+	 * 
+	 * --> 1
+	 * initial
+	 * 
+	 * --> 2
+	 * added last export folder as reportFolderPath
+	 */	
+	
+	@SuppressWarnings("unused")
+	private final String TYPE = SaveFileType.BUDGETMASTER_REPORT_PREFERENCES.toString();
 	private final int VERSION = 2;
 	private ColumnOrder columnOrder;
 	private boolean includeBudget;
diff --git a/src/de/deadlocker8/budgetmaster/logic/tag/TagMatch.java b/src/de/deadlocker8/budgetmaster/logic/tag/TagMatch.java
index c09722461afd3d035b69cb03191843ec35a28551..460c927bb8cbdbd6980d3312b3576aa0cb0a29ce 100644
--- a/src/de/deadlocker8/budgetmaster/logic/tag/TagMatch.java
+++ b/src/de/deadlocker8/budgetmaster/logic/tag/TagMatch.java
@@ -1,6 +1,6 @@
 package de.deadlocker8.budgetmaster.logic.tag;
 
-import de.deadlocker8.budgetmasterserver.logic.DatabaseImportExport;
+import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImportExport;
 
 @DatabaseImportExport
 public class TagMatch
diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/SaveFileType.java b/src/de/deadlocker8/budgetmaster/logic/utils/SaveFileType.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5cf884f072415e071f093dc90e155b3363c5dbd
--- /dev/null
+++ b/src/de/deadlocker8/budgetmaster/logic/utils/SaveFileType.java
@@ -0,0 +1,8 @@
+package de.deadlocker8.budgetmaster.logic.utils;
+
+public enum SaveFileType
+{
+	BUDGETMASTER_DATABASE,
+	BUDGETMASTER_REPORT_PREFERENCES,
+	BUDGETMASTER_SETTINGS
+}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java b/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
index e398a5e7ee1d6111b35e3c603f9ea5755f50a3cb..b631d73467f5653d028e5a3d095a5aad153b2a37 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/Database.java
@@ -7,6 +7,7 @@ import de.deadlocker8.budgetmaster.logic.payment.NormalPayment;
 import de.deadlocker8.budgetmaster.logic.payment.RepeatingPayment;
 import de.deadlocker8.budgetmaster.logic.tag.Tag;
 import de.deadlocker8.budgetmaster.logic.tag.TagMatch;
+import de.deadlocker8.budgetmaster.logic.utils.SaveFileType;
 
 public class Database
 {
@@ -21,7 +22,7 @@ public class Database
 	 */	
 	
 	@SuppressWarnings("unused")
-	private final String TYPE = "BUDGETMASTER_DATABASE";
+	private final String TYPE = SaveFileType.BUDGETMASTER_DATABASE.toString();
 	private final int VERSION = 2;
 	private ArrayList<Category> categoriesX;
 	private ArrayList<NormalPayment> normalPayments;
diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImportExport.java b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImportExport.java
similarity index 73%
rename from src/de/deadlocker8/budgetmasterserver/logic/DatabaseImportExport.java
rename to src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImportExport.java
index 9ea98c3f7ce03bbf6a593b3bafe7a6d8972c0fdb..977bc2ace288c4f49f96761aef1b2d81132f34ff 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseImportExport.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/database/DatabaseImportExport.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterserver.logic;
+package de.deadlocker8.budgetmasterserver.logic.database;
 
 /**
  * Used to mark model classes that only exists in order to allow gson to import and export the database