diff --git a/client/src/main/java/ctbrec/ui/ColorSettingsPane.css b/client/src/main/java/ctbrec/ui/settings/ColorSettingsPane.css
similarity index 100%
rename from client/src/main/java/ctbrec/ui/ColorSettingsPane.css
rename to client/src/main/java/ctbrec/ui/settings/ColorSettingsPane.css
diff --git a/client/src/main/java/ctbrec/ui/ColorSettingsPane.java b/client/src/main/java/ctbrec/ui/settings/ColorSettingsPane.java
similarity index 99%
rename from client/src/main/java/ctbrec/ui/ColorSettingsPane.java
rename to client/src/main/java/ctbrec/ui/settings/ColorSettingsPane.java
index be6feb4e..fd3ac43e 100644
--- a/client/src/main/java/ctbrec/ui/ColorSettingsPane.java
+++ b/client/src/main/java/ctbrec/ui/settings/ColorSettingsPane.java
@@ -1,4 +1,4 @@
-package ctbrec.ui;
+package ctbrec.ui.settings;
 
 import ctbrec.Config;
 import javafx.scene.control.Button;
diff --git a/client/src/main/java/ctbrec/ui/ProxySettingsPane.java b/client/src/main/java/ctbrec/ui/settings/ProxySettingsPane.java
similarity index 99%
rename from client/src/main/java/ctbrec/ui/ProxySettingsPane.java
rename to client/src/main/java/ctbrec/ui/settings/ProxySettingsPane.java
index 1d2ff789..c7de4c8e 100644
--- a/client/src/main/java/ctbrec/ui/ProxySettingsPane.java
+++ b/client/src/main/java/ctbrec/ui/settings/ProxySettingsPane.java
@@ -1,4 +1,4 @@
-package ctbrec.ui;
+package ctbrec.ui.settings;
 import static ctbrec.Settings.ProxyType.*;
 
 import java.util.ArrayList;
diff --git a/client/src/main/java/ctbrec/ui/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java
similarity index 99%
rename from client/src/main/java/ctbrec/ui/SettingsTab.java
rename to client/src/main/java/ctbrec/ui/settings/SettingsTab.java
index 7d56a308..0115f0a4 100644
--- a/client/src/main/java/ctbrec/ui/SettingsTab.java
+++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java
@@ -1,4 +1,4 @@
-package ctbrec.ui;
+package ctbrec.ui.settings;
 
 import static ctbrec.Settings.DirectoryStructure.*;
 
@@ -17,6 +17,9 @@ import ctbrec.Settings.DirectoryStructure;
 import ctbrec.StringUtil;
 import ctbrec.sites.ConfigUI;
 import ctbrec.sites.Site;
+import ctbrec.ui.AutosizeAlert;
+import ctbrec.ui.SiteUiFactory;
+import ctbrec.ui.TabSelectionListener;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -127,6 +130,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
 
         //right side
         rightSide.getChildren().add(siteConfigAccordion);
+        rightSide.getChildren().add(new ActionSettingsPanel(this));
         proxySettingsPane = new ProxySettingsPane(this);
         rightSide.getChildren().add(proxySettingsPane);
         for (int i = 0; i < sites.size(); i++) {
@@ -390,7 +394,6 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         GridPane.setMargin(showPlayerStarting, new Insets(CHECKBOX_MARGIN, 0, 0, CHECKBOX_MARGIN));
         layout.add(showPlayerStarting, 1, row++);
 
-
         l = new Label("Display stream resolution in overview");
         layout.add(l, 0, row);
         loadResolution = new CheckBox();
@@ -398,15 +401,11 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         loadResolution.setOnAction((e) -> {
             Config.getInstance().getSettings().determineResolution = loadResolution.isSelected();
             saveConfig();
-            if(!loadResolution.isSelected()) {
-                ThumbOverviewTab.queue.clear();
-            }
         });
         GridPane.setMargin(l, new Insets(CHECKBOX_MARGIN, 0, 0, 0));
         GridPane.setMargin(loadResolution, new Insets(CHECKBOX_MARGIN, 0, 0, CHECKBOX_MARGIN));
         layout.add(loadResolution, 1, row++);
 
-
         l = new Label("Manually select stream quality");
         layout.add(l, 0, row);
         chooseStreamQuality.setSelected(Config.getInstance().getSettings().chooseStreamQuality);
diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsConfigUI.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsConfigUI.java
index 9597977f..0755f024 100644
--- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsConfigUI.java
+++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsConfigUI.java
@@ -4,7 +4,7 @@ import ctbrec.Config;
 import ctbrec.Settings;
 import ctbrec.sites.bonga.BongaCams;
 import ctbrec.ui.DesktopIntegration;
-import ctbrec.ui.SettingsTab;
+import ctbrec.ui.settings.SettingsTab;
 import ctbrec.ui.sites.AbstractConfigUI;
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java
index bd61bc90..46ce3490 100644
--- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java
+++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java
@@ -4,7 +4,7 @@ import ctbrec.Config;
 import ctbrec.Settings;
 import ctbrec.sites.cam4.Cam4;
 import ctbrec.ui.DesktopIntegration;
-import ctbrec.ui.SettingsTab;
+import ctbrec.ui.settings.SettingsTab;
 import ctbrec.ui.sites.AbstractConfigUI;
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java
index 7cb3e964..197108dc 100644
--- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java
+++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java
@@ -4,7 +4,7 @@ import ctbrec.Config;
 import ctbrec.Settings;
 import ctbrec.sites.camsoda.Camsoda;
 import ctbrec.ui.DesktopIntegration;
-import ctbrec.ui.SettingsTab;
+import ctbrec.ui.settings.SettingsTab;
 import ctbrec.ui.sites.AbstractConfigUI;
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java
index f1e1cf55..8133bf90 100644
--- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java
+++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateConfigUi.java
@@ -4,7 +4,7 @@ import ctbrec.Config;
 import ctbrec.Settings;
 import ctbrec.sites.chaturbate.Chaturbate;
 import ctbrec.ui.DesktopIntegration;
-import ctbrec.ui.SettingsTab;
+import ctbrec.ui.settings.SettingsTab;
 import ctbrec.ui.sites.AbstractConfigUI;
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsConfigUI.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsConfigUI.java
index 67d30a07..cf258844 100644
--- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsConfigUI.java
+++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsConfigUI.java
@@ -4,7 +4,7 @@ import ctbrec.Config;
 import ctbrec.Settings;
 import ctbrec.sites.mfc.MyFreeCams;
 import ctbrec.ui.DesktopIntegration;
-import ctbrec.ui.SettingsTab;
+import ctbrec.ui.settings.SettingsTab;
 import ctbrec.ui.sites.AbstractConfigUI;
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
diff --git a/common/src/main/java/ctbrec/EventBusHolder.java b/common/src/main/java/ctbrec/event/EventBusHolder.java
similarity index 100%
rename from common/src/main/java/ctbrec/EventBusHolder.java
rename to common/src/main/java/ctbrec/event/EventBusHolder.java