diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java b/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
index 88294ca416ae850b8eed311020d0453e8b2a4175..a467906c0f39c2c0229d661986291f43238ad5ec 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.advices;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ModelAttribute;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
index c7cdfb79b007b87d00c2a05d41cd4bd7f0822c2a..95300f7dc5e3c15ed8a2e50e0b1689340fadc5db 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.controller;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.services.HelpersService;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
index d35c5b1158a9c5ea1578af754ac936debb837733..ec76d674c2f5dcbebb89ab3e3b59fa889f08a10d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
@@ -9,8 +9,8 @@ import de.deadlocker8.budgetmaster.database.Database;
 import de.deadlocker8.budgetmaster.database.DatabaseParser;
 import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
 import de.deadlocker8.budgetmaster.categories.CategoryType;
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.services.*;
 import de.deadlocker8.budgetmaster.update.BudgetMasterUpdateService;
 import de.deadlocker8.budgetmaster.utils.LanguageType;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
index 4ace89620fade084f6ca670f132f0cf508910c32..efe0f220af205b6a80cc39fbc6fbc07d9bc335d3 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
@@ -3,19 +3,16 @@ package de.deadlocker8.budgetmaster.reports;
 import com.itextpdf.text.DocumentException;
 import de.deadlocker8.budgetmaster.categories.CategoryService;
 import de.deadlocker8.budgetmaster.controller.BaseController;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.accounts.AccountType;
 import de.deadlocker8.budgetmaster.reports.columns.ReportColumn;
 import de.deadlocker8.budgetmaster.reports.settings.ReportSettings;
 import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
-import de.deadlocker8.budgetmaster.reports.Budget;
-import de.deadlocker8.budgetmaster.reports.ReportConfiguration;
-import de.deadlocker8.budgetmaster.reports.ReportConfigurationBuilder;
 import de.deadlocker8.budgetmaster.reports.categoryBudget.CategoryBudgetHandler;
 import de.deadlocker8.budgetmaster.services.*;
 import de.deadlocker8.budgetmaster.reports.columns.ReportColumnService;
-import de.deadlocker8.budgetmaster.reports.ReportGeneratorService;
 import de.deadlocker8.budgetmaster.reports.settings.ReportSettingsService;
 import de.deadlocker8.budgetmaster.transactions.TransactionService;
 import de.thecodelabs.utils.util.Localization;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 6024996a58bb94e203e131584f6d16568eec5cd9..0de8b50839cebd7cadc9461a4b6060c0fd78740f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -2,7 +2,8 @@ package de.deadlocker8.budgetmaster.services;
 
 import de.deadlocker8.budgetmaster.accounts.AccountService;
 import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatch;
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.tags.Tag;
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.accounts.AccountType;
@@ -12,7 +13,7 @@ import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
 import de.deadlocker8.budgetmaster.accounts.AccountRepository;
 import de.deadlocker8.budgetmaster.categories.CategoryRepository;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.tags.TagRepository;
 import de.deadlocker8.budgetmaster.transactions.TransactionService;
 import de.deadlocker8.budgetmaster.update.BudgetMasterUpdateService;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
index b09d0bd1d4de046b60643f973292e008abb5216e..f86a16ae54d97593cb4a0b32fa8722755981036d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
@@ -1,5 +1,6 @@
 package de.deadlocker8.budgetmaster.services;
 
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.thecodelabs.utils.util.Localization;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
similarity index 88%
rename from src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
index e42e868a2b83746cf66481171eded281b61029f3..0424e31f6ba5b3621cf6c5cbfb5458d35ccf4eeb 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
@@ -1,14 +1,9 @@
-package de.deadlocker8.budgetmaster.entities;
+package de.deadlocker8.budgetmaster.settings;
 
 import de.deadlocker8.budgetmaster.utils.LanguageType;
-import javafx.scene.paint.Color;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 @Entity
 public class Settings
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
similarity index 58%
rename from src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
index 43e2267e6f2c1f7a4a9ec63d1afba857c070feba..3bd6098af38b8d2bd51b2db4b84961e0685fd619 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
@@ -1,6 +1,6 @@
-package de.deadlocker8.budgetmaster.repositories;
+package de.deadlocker8.budgetmaster.settings;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
similarity index 82%
rename from src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
index 43599d9878015728ab5605e0fe47cde827f9944f..a5dbcaabdc655320e18e501150f15dddd21f1af2 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
@@ -1,7 +1,7 @@
-package de.deadlocker8.budgetmaster.services;
+package de.deadlocker8.budgetmaster.settings;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java b/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
index 0c4e6205e040ad16c186bfe3355cbf96c4bb0e3b..49e546d80aa75ebf63a4f2070d8b8bd577fa521c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
@@ -1,6 +1,5 @@
 package de.deadlocker8.budgetmaster.tags;
 
-import de.deadlocker8.budgetmaster.tags.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index f932af67a1f967aa55e558779f79c121b64c669d..f10eb3e169a5c47d4e872ffac4dc867d93e37a87 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -2,7 +2,8 @@ package de.deadlocker8.budgetmaster.transactions;
 
 import de.deadlocker8.budgetmaster.categories.CategoryRepository;
 import de.deadlocker8.budgetmaster.controller.BaseController;
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.tags.Tag;
 import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
 import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
index ae53d67020418878b128bfcf5c92b5dd7cc0582b..bbbc67a8bb6a02098eec50d40d3848da0a2ff9ef 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.update;
 
 import de.deadlocker8.budgetmaster.Build;
 import de.deadlocker8.budgetmaster.Main;
-import de.deadlocker8.budgetmaster.services.SettingsService;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.thecodelabs.storage.settings.Storage;
 import de.thecodelabs.storage.settings.StorageTypes;
 import de.thecodelabs.versionizer.VersionizerItem;