diff --git a/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java b/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
index 7691158c4d971f4fb1b6fee394c93868e2da9a21..cd3d5a1021f4e379b978844636a7547ed5a8c4f2 100644
--- a/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
+++ b/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
@@ -2,8 +2,8 @@ package de.tobias.playpad.action.cartaction;
import de.tobias.playpad.action.feedback.FeedbackMessage;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
+import de.tobias.playpad.settings.Warning;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java b/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
index 5d1bb8c37cc82cd8189fc2c1821ef60fb723d0be..2dcc8211312456283a3ab3d6076a252f66ce5a50 100644
--- a/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
+++ b/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
@@ -4,7 +4,7 @@ import de.tobias.playpad.action.feedback.FeedbackMessage;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.pad.conntent.Durationable;
-import de.tobias.playpad.pad.Warning;
+import de.tobias.playpad.settings.Warning;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
index 013765c7953f7a69791ae7c5d1a80c166ca1b088..0e6d1952c35ea8cc7f3c8ad22c9ee122b1ffd996 100644
--- a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
+++ b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
@@ -15,8 +15,8 @@ import de.tobias.playpad.PseudoClasses;
import de.tobias.playpad.layout.CartLayout;
import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.IPadView;
import de.tobias.utils.util.ColorXMLUtils;
import javafx.application.Platform;
diff --git a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
index 8618a813cab625a4dca5d5aa260e161fa59be595..2f067be0999ac96553b147d75bde2c479098014b 100644
--- a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
+++ b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
@@ -11,9 +11,9 @@ import de.tobias.playpad.layout.CartLayout;
import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.IPadView;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.utils.application.ApplicationUtils;
diff --git a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
index fef4f679a0c476f4aafc354a38a6af2a0663e18b..123f41277e3ab741e7744047d36bddb17b92af9e 100644
--- a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
+++ b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
@@ -9,9 +9,9 @@ import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.layout.LayoutColorAssociator;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
import javafx.scene.paint.Color;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
index 925b392b8eec6daefe124e45c52dd2861fa73f37..c8e79942e2a50cc747ce271d5a55ce805186cf45 100644
--- a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
+++ b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
@@ -13,11 +13,11 @@ import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.layout.LayoutColorAssociator;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java b/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
index b9f60d711e6b4f4aad86b3e1d108bc09bc87628d..bdb5f35a716c1a17f448d408aa1cb5d004314f11 100644
--- a/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
+++ b/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
@@ -2,11 +2,11 @@ package de.tobias.playpad.pad.listener;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.conntent.Fadeable;
import de.tobias.playpad.pad.conntent.PadContent;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.pad.PadViewController;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
index 6c6274b3da4766dfbba104f2a49e2f59a0648e8c..4cae57b156b833e7b8eb572b7830a9c0a8bbed94 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
@@ -2,9 +2,9 @@ package de.tobias.playpad.viewcontroller.option.pad;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
-import de.tobias.playpad.pad.Fade;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
+import de.tobias.playpad.settings.Fade;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.PadSettingsTabViewController;
import de.tobias.playpad.viewcontroller.settings.FadeViewController;
import de.tobias.playpad.viewcontroller.settings.WarningFeedbackViewController;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
index 2a4ee9720e830b10eedb994e8534521a945c4ec2..dfa3c7331e8bdaf6eef9bc609d9f2e3bdbf92cc0 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
@@ -2,7 +2,7 @@ package de.tobias.playpad.viewcontroller.settings;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
-import de.tobias.playpad.pad.Fade;
+import de.tobias.playpad.settings.Fade;
import de.tobias.utils.ui.ContentViewController;
import de.tobias.utils.util.Localization;
import javafx.fxml.FXML;
diff --git a/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java b/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
index 46dec367e902df0ec0e13d6b175312cd5f650039..9f9fabc5ddee03ced42dca9441a1e62c451fd8f9 100644
--- a/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
+++ b/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
@@ -2,8 +2,8 @@ package de.tobias.playpad.layout;
import org.dom4j.Element;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
public interface CartLayout {
diff --git a/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java b/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
index 8622bca5cdd319fd08d446261301b58052d5b4aa..e7b95f72544c09c02a9168923ffc74bdacdffb0a 100644
--- a/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
+++ b/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
@@ -14,9 +14,9 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import javafx.stage.Stage;
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
index 71dbdce75429f5ed3679a906edc08ba57b5a5856..fc37a84959f38c155a973d0c0ba2d9ddaa9f77c5 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
@@ -16,7 +16,9 @@ import de.tobias.playpad.pad.triggerlistener.PadTriggerDurationListener;
import de.tobias.playpad.pad.triggerlistener.PadTriggerStatusListener;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Fade;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.tigger.Trigger;
import de.tobias.playpad.tigger.TriggerPoint;
import de.tobias.utils.settings.UserDefaults;
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index 8cda094d15b3871873d614c6bdf02063ad134d2b..39beedc9b363f351d99cd22a6d1f0acdca38f2ea 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -124,9 +124,6 @@ public class Project {
Path projectPath = ref.getProjectPath();
if (Files.exists(projectPath)) {
- SAXReader reader = new SAXReader();
- Document document = reader.read(Files.newInputStream(projectPath));
-
if (ref.getProfileReference() != null) {
Profile.load(ref.getProfileReference()); // Lädt das entsprechende Profile und aktiviert es
} else {
@@ -136,6 +133,9 @@ public class Project {
Project project = new Project(ref);
+ SAXReader reader = new SAXReader();
+ Document document = reader.read(Files.newInputStream(projectPath));
+
Element rootElement = document.getRootElement();
for (Object padObj : rootElement.elements(PAD_ELEMENT)) {
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Fade.java b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/pad/Fade.java
rename to PlayWallCore/src/de/tobias/playpad/settings/Fade.java
index 09e47651733eafbee7c39a7639d089c25a38efe5..73d9ba15ff65457e984f61d95bb43b9981af6b97 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Fade.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.pad;
+package de.tobias.playpad.settings;
import org.dom4j.Element;
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java b/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
index 78bc49db58cb5e8c6e833852a22ba3eed12fb7b2..9189fb33224213e3ba3a70be6b65029f6aa29baf 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
@@ -17,9 +17,7 @@ import org.dom4j.io.XMLWriter;
import de.tobias.playpad.audio.AudioRegistry;
import de.tobias.playpad.layout.LayoutRegistry;
-import de.tobias.playpad.pad.Fade;
import de.tobias.playpad.pad.TimeMode;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.update.UpdateChannel;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Warning.java b/PlayWallCore/src/de/tobias/playpad/settings/Warning.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/pad/Warning.java
rename to PlayWallCore/src/de/tobias/playpad/settings/Warning.java
index 11cef9723bf8cc315d29160979934c37f1e8043d..56de8f3d2bdbb892aff6966cd72384500d339cb5 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Warning.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Warning.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.pad;
+package de.tobias.playpad.settings;
import org.dom4j.Element;