diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index e181121..956a896 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -18,6 +18,7 @@ import envoy.client.data.LocalDB;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.client.ui.settings.SettingsSceneController;
 import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
diff --git a/src/main/java/envoy/client/ui/package-info.java b/src/main/java/envoy/client/ui/package-info.java
index 10bf4ee..9f94ac2 100644
--- a/src/main/java/envoy/client/ui/package-info.java
+++ b/src/main/java/envoy/client/ui/package-info.java
@@ -1,8 +1,8 @@
 /**
  * This package contains classes defining the user interface.
  *
- * @author Kai S. K. Engelbart
  * @author Leon Hofmeister
+ * @author Kai S. K. Engelbart
  * @author Maximilian Käfer
  * @since Envoy Client v0.1-beta
  */
diff --git a/src/main/java/envoy/client/ui/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
similarity index 96%
rename from src/main/java/envoy/client/ui/GeneralSettingsPane.java
rename to src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
index b207867..6c561f0 100644
--- a/src/main/java/envoy/client/ui/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import java.util.List;
 
diff --git a/src/main/java/envoy/client/ui/SettingsPane.java b/src/main/java/envoy/client/ui/settings/SettingsPane.java
similarity index 93%
rename from src/main/java/envoy/client/ui/SettingsPane.java
rename to src/main/java/envoy/client/ui/settings/SettingsPane.java
index 79bec4b..7c84221 100644
--- a/src/main/java/envoy/client/ui/SettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsPane.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.scene.layout.Pane;
 
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
similarity index 95%
rename from src/main/java/envoy/client/ui/SettingsSceneController.java
rename to src/main/java/envoy/client/ui/settings/SettingsSceneController.java
index 33f45a6..e3cc4fb 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
@@ -1,8 +1,10 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
+import envoy.client.ui.Startup;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsSceneController.java</strong><br>
diff --git a/src/main/java/envoy/client/ui/SettingsToggleButton.java b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
similarity index 94%
rename from src/main/java/envoy/client/ui/SettingsToggleButton.java
rename to src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
index f91f7cb..adb7b92 100644
--- a/src/main/java/envoy/client/ui/SettingsToggleButton.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.event.ActionEvent;
 import javafx.scene.control.ToggleButton;
diff --git a/src/main/java/envoy/client/ui/settings/package-info.java b/src/main/java/envoy/client/ui/settings/package-info.java
new file mode 100644
index 0000000..9774362
--- /dev/null
+++ b/src/main/java/envoy/client/ui/settings/package-info.java
@@ -0,0 +1,14 @@
+/**
+ * This package contains classes used for representing the settings
+ * visually.<br>
+ * <br>
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>package-info.java</strong><br>
+ * Created: <strong>19 Apr 2020</strong><br>
+ *
+ * @author Leon Hofmeister
+ * @author Kai S. K. Engelbart
+ * @author Maximilian K&auml;fer
+ * @since Envoy Client v0.1-beta
+ */
+package envoy.client.ui.settings;
\ No newline at end of file
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 9413967..c34aeff 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -19,5 +19,6 @@ module envoy {
 	requires javafx.base;
 	requires javafx.graphics;
 
+	opens envoy.client.ui.settings to javafx.graphics, javafx.fxml;
 	opens envoy.client.ui to javafx.graphics, javafx.fxml;
 }
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
index 3aaee9a..d61fb53 100644
--- a/src/main/resources/fxml/SettingsScene.fxml
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.SettingsSceneController">
+<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.settings.SettingsSceneController">
 	<children>
 		<HBox prefHeight="100.0" prefWidth="200.0">
          <children>