diff --git a/docs/code-howtos/index.md b/docs/code-howtos/index.md
index e8b49cc188f..fac5c87c85f 100644
--- a/docs/code-howtos/index.md
+++ b/docs/code-howtos/index.md
@@ -47,7 +47,7 @@ JabRef stores files relative to one of [multiple possible directories](https://d
 The convert the relative path to an absolute one, there is the `find` method in `FileUtil`:
 
 ```java
-org.jabref.logic.util.io.FileUtil.find(org.jabref.model.database.BibDatabaseContext, java.lang.String, org.jabref.preferences.FilePreferences)
+org.jabref.logic.util.io.FileUtil.find(org.jabref.model.database.BibDatabaseContext, java.lang.String, org.jabref.gui.FilePreferences)
 ```
 
 `String path` Can be the files name or a relative path to it. The Preferences should only be directly accessed in the GUI. For the usage in logic pass them as parameter
@@ -59,7 +59,7 @@ When adding a file to a library, the path should be stored relative to "the best
 This is implemented in `FileUtil`:
 
 ```java
-org.jabref.logic.util.io.FileUtil.relativize(java.nio.file.Path, org.jabref.model.database.BibDatabaseContext, org.jabref.preferences.FilePreferences)
+org.jabref.logic.util.io.FileUtil.relativize(java.nio.file.Path, org.jabref.model.database.BibDatabaseContext, org.jabref.gui.FilePreferences)
 ```
 
 ## Setting a Directory for a .bib File
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index cdcb7994b3d..d294d4ec732 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -14,6 +14,7 @@
 import java.util.prefs.BackingStoreException;
 
 import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.UiCommand;
@@ -42,6 +43,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.search.DatabaseSearcher;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.util.io.FileUtil;
@@ -55,9 +57,7 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SearchPreferences;
 
 import com.airhacks.afterburner.injection.Injector;
 import com.google.common.base.Throwables;
diff --git a/src/main/java/org/jabref/preferences/FilePreferences.java b/src/main/java/org/jabref/gui/FilePreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/FilePreferences.java
rename to src/main/java/org/jabref/gui/FilePreferences.java
index fe89be62899..798e2b3f8a5 100644
--- a/src/main/java/org/jabref/preferences/FilePreferences.java
+++ b/src/main/java/org/jabref/gui/FilePreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui;
 
 import java.nio.file.Path;
 import java.util.Comparator;
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/gui/GuiPreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/GuiPreferences.java
rename to src/main/java/org/jabref/gui/GuiPreferences.java
index af79cc49a99..3f88924b87c 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/gui/GuiPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 98a45919301..eeff1b14ef7 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -40,7 +40,6 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DirectoryMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.injection.Injector;
diff --git a/src/main/java/org/jabref/preferences/WorkspacePreferences.java b/src/main/java/org/jabref/gui/WorkspacePreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/WorkspacePreferences.java
rename to src/main/java/org/jabref/gui/WorkspacePreferences.java
index 57d97a971b6..2948be7582e 100644
--- a/src/main/java/org/jabref/preferences/WorkspacePreferences.java
+++ b/src/main/java/org/jabref/gui/WorkspacePreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui;
 
 import java.util.List;
 
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
index fa24208105e..a479ace35e6 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<?import org.jabref.gui.icon.JabRefIconView?>
-
-<?import org.jabref.gui.ai.components.util.Loadable?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.ai.components.aichat.chathistory.ChatHistoryComponent?>
 <?import org.jabref.gui.ai.components.aichat.chatprompt.ChatPromptComponent?>
-
+<?import org.jabref.gui.ai.components.util.Loadable?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root
         type="javafx.scene.layout.VBox"
         spacing="10"
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
index c3f7e6d3550..c1a43b45dbd 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
@@ -21,6 +21,7 @@
 import org.jabref.gui.ai.components.util.notifications.Notification;
 import org.jabref.gui.ai.components.util.notifications.NotificationsComponent;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.ai.chatting.AiChatLogic;
 import org.jabref.logic.ai.util.CitationKeyCheck;
@@ -32,7 +33,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.ListUtil;
-import org.jabref.preferences.ai.AiPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import dev.langchain4j.data.message.AiMessage;
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
index c7e5d61f72d..6f405c2e8dd 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
@@ -5,13 +5,13 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.components.util.EmbeddingModelGuardedComponent;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.message.ChatMessage;
 
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
index 5005f5103fa..d321be5e791 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
@@ -5,14 +5,14 @@
 import javafx.scene.Scene;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.util.BaseWindow;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.message.ChatMessage;
 
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
index b204fc467de..20836e0e3bb 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.VBox?>
 <fx:root
         type="javafx.scene.control.ScrollPane"
         xmlns="http://javafx.com/javafx/17.0.2-ea"
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
index 6c0e899a064..92f428872d1 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.dlsc.gemsfx.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 <?import org.jabref.gui.icon.JabRefIconView?>
+<?import com.dlsc.gemsfx.ExpandingTextArea?>
 <fx:root nodeOrientation="LEFT_TO_RIGHT" type="javafx.scene.layout.Pane" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.aichat.chatmessage.ChatMessageComponent">
     <children>
         <HBox fx:id="wrapperHBox" spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.fxml
index b933fc2b7bf..04c53eaab88 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.fxml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.HBox?>
 <?import com.dlsc.gemsfx.ExpandingTextArea?>
 <fx:root
         type="javafx.scene.layout.HBox"
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
index c8af00148ce..1da910e9d1b 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
@@ -3,10 +3,10 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.components.aichat.AiChatGuardedComponent;
 import org.jabref.gui.util.DynamicallyChangeableNode;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 /**
  * A class that guards a component, before AI privacy policy is accepted.
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
index 91984a61731..dac1c1ab657 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
 <fx:root type="ScrollPane" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.privacynotice.PrivacyNoticeComponent">
       <VBox spacing="10.0">
          <padding>
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
index 3c59f4ba54a..e66eb7c93df 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
@@ -9,9 +9,9 @@
 import javafx.scene.text.TextFlow;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java b/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
index 3a164c2739c..6fabc3aaec8 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
@@ -5,8 +5,10 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.components.privacynotice.AiPrivacyNoticeGuardedComponent;
 import org.jabref.gui.ai.components.util.errorstate.ErrorStateComponent;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.ai.processingstatus.ProcessingInfo;
 import org.jabref.logic.ai.summarization.Summary;
@@ -18,8 +20,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
index db7698eccf6..f248bccab17 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
 <fx:root alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.summary.SummaryShowingComponent">
    <children>
       <TextArea fx:id="summaryTextArea" editable="false" wrapText="true" VBox.vgrow="ALWAYS" />
diff --git a/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
index e81bb4f3b58..e8d74975079 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
@@ -3,14 +3,14 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.components.privacynotice.AiPrivacyNoticeGuardedComponent;
 import org.jabref.gui.ai.components.util.errorstate.ErrorStateComponent;
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.ai.ingestion.model.JabRefEmbeddingModel;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import com.google.common.eventbus.Subscribe;
 
diff --git a/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.fxml b/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.fxml
index 77d7475cfb1..79353bcae55 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.fxml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 <fx:root prefHeight="200.0" prefWidth="500.0" type="BorderPane" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.util.errorstate.ErrorStateComponent">
    <center>
       <VBox fx:id="contentsVBox" alignment="CENTER" spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
index ba378bad300..cf35336765d 100644
--- a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
+++ b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
@@ -10,10 +10,10 @@
 
 import org.jabref.gui.FXDialog;
 import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.io.BackupFileUtil;
-import org.jabref.preferences.ExternalApplicationsPreferences;
 
 import org.controlsfx.control.HyperlinkLabel;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
index ff1c35bec0e..a13c7765c31 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.CleanupWorker;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
@@ -20,7 +21,6 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class CleanupAction extends SimpleCommand {
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 28c94a2cf88..5f3a36f3d0e 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -3,11 +3,11 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ScrollPane;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.CleanupPreferences;
-import org.jabref.preferences.FilePreferences;
 
 public class CleanupDialog extends BaseDialog<CleanupPreferences> {
     public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreferences initialPreset, FilePreferences filePreferences) {
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
index 3014189f0d6..2bfd6786a24 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
@@ -3,11 +3,9 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.control.RadioButton?>
-
 <fx:root xmlns:fx="http://javafx.com/fxml/1" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.121"
          fx:controller="org.jabref.gui.cleanup.CleanupPresetPanel">
     <fx:define>
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 18dd701e626..76faca6c8ae 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -11,13 +11,13 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.CleanupPreferences;
-import org.jabref.preferences.FilePreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
index a14278b8576..295f205faa9 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
@@ -11,12 +11,12 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.CleanupWorker;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class CleanupSingleAction extends SimpleCommand {
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
index 29bc0716b59..435a2a2ce72 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
@@ -7,6 +7,7 @@
 import javafx.beans.binding.Bindings;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
@@ -14,7 +15,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 
 public class CopySingleFileAction extends SimpleCommand {
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
index fc374e01081..80330f64b34 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -8,8 +8,8 @@
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.Directories;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/Linux.java b/src/main/java/org/jabref/gui/desktop/os/Linux.java
index 4ee5ff364e4..fd12100c07c 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -15,13 +15,13 @@
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.StreamGobbler;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
index 9312116924c..9f919768f97 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -18,8 +18,10 @@
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.importer.util.IdentifierParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Directories;
@@ -31,8 +33,6 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Identifier;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.ExternalApplicationsPreferences;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
diff --git a/src/main/java/org/jabref/gui/desktop/os/OSX.java b/src/main/java/org/jabref/gui/desktop/os/OSX.java
index 02a8afda86d..e114b1b1132 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -7,9 +7,9 @@
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.preferences.FilePreferences;
 
 /**
  * This class contains macOS (OSX) specific implementations for file directories and file/application open handling methods <br>
diff --git a/src/main/java/org/jabref/gui/desktop/os/Windows.java b/src/main/java/org/jabref/gui/desktop/os/Windows.java
index f86c7ad70eb..ba6c824b8e2 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -11,10 +11,10 @@
 
 import org.jabref.Launcher;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.util.Directories;
-import org.jabref.preferences.FilePreferences;
 
 import com.sun.jna.platform.win32.KnownFolders;
 import com.sun.jna.platform.win32.Shell32Util;
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index d96962b6e5a..0bb06bbf1e0 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -18,6 +18,7 @@
 import org.jabref.gui.collab.DatabaseChangeList;
 import org.jabref.gui.collab.DatabaseChangeResolverFactory;
 import org.jabref.gui.collab.DatabaseChangesResolverDialog;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -29,7 +30,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
index 03dfa017872..c4a5f8773a0 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -13,9 +13,9 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.KeywordList;
-import org.jabref.preferences.BibEntryPreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index 418db4f0bb9..76ba2c78124 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.edit;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.os.NativeDesktop;
-import org.jabref.preferences.FilePreferences;
 
 public class OpenBrowserAction extends SimpleCommand {
 
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
index 1302a550b17..99f6909c51c 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
@@ -10,7 +10,6 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
-
 <fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView">
     <children>
           <GridPane hgap="8.0" layoutX="16.0" layoutY="246.0" minHeight="160.0" prefHeight="230.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="8.0">
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
index 1beac33dd48..2fb80b223b0 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
@@ -12,8 +13,6 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
-
-
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentTabView">
    <children>
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml
index 9e4b5b54269..e6ff38d9996 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml
@@ -10,7 +10,6 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
-
 <fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldTabView">
    <children>
       <GridPane hgap="8.0" layoutY="85.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
index 0fd55ab889f..f81312fadf7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
@@ -11,10 +11,12 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.ai.components.aichat.AiChatGuardedComponent;
 import org.jabref.gui.ai.components.privacynotice.PrivacyNoticeComponent;
 import org.jabref.gui.ai.components.util.errorstate.ErrorStateComponent;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.ai.util.CitationKeyCheck;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
@@ -24,9 +26,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.ai.AiPreferences;
 
 public class AiChatTab extends EntryEditorTab {
     private final BibDatabaseContext bibDatabaseContext;
diff --git a/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java b/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
index f61f69eb1bc..961ac10d4d8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
@@ -3,15 +3,15 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.ai.components.summary.SummaryComponent;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.ai.AiPreferences;
 
 public class AiSummaryTab extends EntryEditorTab {
     private final BibDatabaseContext bibDatabaseContext;
diff --git a/src/main/java/org/jabref/preferences/MrDlibPreferences.java b/src/main/java/org/jabref/gui/entryeditor/MrDlibPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/MrDlibPreferences.java
rename to src/main/java/org/jabref/gui/entryeditor/MrDlibPreferences.java
index fd6a0b4cc4a..8a6a2cffbcc 100644
--- a/src/main/java/org/jabref/preferences/MrDlibPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MrDlibPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.entryeditor;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index 70eeed855a7..2eda620d3f4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -29,7 +29,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.MrDlibPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
index 8172f1b28bb..4c93e63161f 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
@@ -7,6 +7,7 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.fieldeditors.WriteMetadataToSinglePdfAction;
@@ -20,7 +21,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index da256e45125..e4b8211a802 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -8,6 +8,7 @@
 import java.util.Optional;
 import java.util.function.BiConsumer;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -18,7 +19,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 305358ce9b6..145ffa23eae 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -9,6 +9,7 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -21,7 +22,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
index ece8217dfca..93e0ac6cc4f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
@@ -5,13 +5,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.FileFilterConverter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.FileType;
-import org.jabref.preferences.FilePreferences;
 
 public class FileExtensionViewModel {
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 7b060595d64..168fc1208c9 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -14,6 +14,7 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
@@ -53,7 +54,6 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
index 671cc197540..abbe29c5827 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
@@ -20,7 +20,7 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.FilePreferences;
+import org.jabref.gui.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/preferences/UnlinkedFilesDialogPreferences.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/UnlinkedFilesDialogPreferences.java
rename to src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
index d4fc04e4ad4..26324a7e949 100644
--- a/src/main/java/org/jabref/preferences/UnlinkedFilesDialogPreferences.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.externalfiles;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index c5606bb83f0..b332cc0e9cf 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -50,7 +50,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.UnlinkedFilesDialogPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
index 4c53779cc0d..c57401d75ec 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
@@ -11,7 +11,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
+import org.jabref.gui.FilePreferences;
 
 /**
  * {@link FileFilter} implementation, that allows only files which are not linked in any of the {@link BibEntry}s of the
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
index 57126dfc7c3..19b00fde6cb 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
@@ -2,6 +2,7 @@
 
 import java.util.Objects;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
@@ -10,7 +11,7 @@
  * The class contains enough information to provide an icon, a standard extension
  * and a link to which application handles files of this type.
  *
- * TODO: Move to model (and then adapt {@link org.jabref.gui.fieldeditors.LinkedFilesEditorViewModel#fromFile(java.nio.file.Path, java.util.List, org.jabref.preferences.FilePreferences)}).
+ * TODO: Move to model (and then adapt {@link org.jabref.gui.fieldeditors.LinkedFilesEditorViewModel#fromFile(java.nio.file.Path, java.util.List, FilePreferences)}).
  */
 public class CustomExternalFileType implements ExternalFileType {
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
index 25e2bfaa088..5a206ccfa06 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -10,11 +10,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.FilePreferences;
 
 // Do not make this class final, as it otherwise can't be mocked for tests
 public class ExternalFileTypes {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
index e7e7636073c..3e510e84fd9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
@@ -3,9 +3,9 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.fieldeditors.EditorTextField?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<?import javafx.scene.layout.VBox?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.JournalEditor">
     <EditorTextField fx:id="textField"/>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 6f65849420c..932a69d2017 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -22,6 +22,7 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -48,7 +49,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index f304bbc7733..3a40526d644 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -21,6 +21,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.externalfiletype.CustomExternalFileType;
@@ -44,7 +45,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
index d7f58db7c00..db45bfe0fe0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
@@ -7,8 +7,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.preferences.FilePreferences;
 
 public class URLUtil {
     private static final String URL_EXP = "^(https?|ftp)://.+";
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
index 0ae63037287..14809e7eca8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
@@ -7,6 +7,7 @@
 import javax.xml.transform.TransformerException;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
@@ -20,7 +21,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
index 7611f0595d2..f3dd7a75d5f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
@@ -5,12 +5,11 @@
 <?import javafx.scene.chart.LineChart?>
 <?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
-<?import javafx.scene.control.ScrollPane?>
 <fx:root VBox.vgrow="ALWAYS" alignment="TOP_CENTER" prefHeight="800.0" prefWidth="1200.0" spacing="10.0" styleClass="info-container" type="VBox" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.fieldeditors.journalinfo.JournalInfoView">
     <Label fx:id="title" styleClass="info-heading">
         <opaqueInsets>
diff --git a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
rename to src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
index 992038c80f3..a8a44de7283 100644
--- a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.frame;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
diff --git a/src/main/java/org/jabref/preferences/SidePanePreferences.java b/src/main/java/org/jabref/gui/frame/SidePanePreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/SidePanePreferences.java
rename to src/main/java/org/jabref/gui/frame/SidePanePreferences.java
index 0cdbc3b52b2..86c6751d659 100644
--- a/src/main/java/org/jabref/preferences/SidePanePreferences.java
+++ b/src/main/java/org/jabref/gui/frame/SidePanePreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.frame;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index b7ab8b2c55a..1e0786d9783 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.help;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.logic.help.HelpFile;
-import org.jabref.preferences.FilePreferences;
 
 /**
  * This Action keeps a reference to a URL. When activated, it shows the help
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index dbf7d3841ff..51cbc51489b 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -8,11 +8,11 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Version;
-import org.jabref.preferences.FilePreferences;
 
 public class NewVersionDialog extends BaseDialog<Boolean> {
 
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index 013308fc8d2..4e9c37e23aa 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -7,12 +7,12 @@
 import java.util.concurrent.TimeUnit;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
+import org.jabref.logic.InternalPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.Version;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index ed68c2425c7..24567376a72 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.Pane?>
-
 <DialogPane fx:id="dialogPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="92.0" prefWidth="392.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.GenerateEntryFromIdDialog">
    <content>
        <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
index 62e2427da77..4be2fabb5c4 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -11,7 +12,6 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.CheckListView?>
-<?import javafx.scene.control.ComboBox?>
 <?import org.fxmisc.richtext.CodeArea?>
 <DialogPane prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.ImportEntriesDialog">
diff --git a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
index da8703b5e8b..2694a688ee7 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -5,11 +5,11 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.ImportCustomEntryTypesDialog;
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index 51f136ca195..3f63182f118 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -13,6 +13,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.ParserResult;
@@ -23,7 +24,6 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SidePanePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
index e53f39e421d..b089a1e5c4b 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -14,13 +14,13 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-import org.jabref.preferences.FilePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
index 9e01a3a76eb..6d34e778576 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -22,7 +22,7 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
-import org.jabref.preferences.CleanupPreferences;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class SavingPropertiesViewModel implements PropertiesTabViewModel {
diff --git a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
index 110eaf52cea..1a03c8ac789 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -16,7 +17,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 public class AttachFileAction extends SimpleCommand {
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
index dafb25d9686..c534be86cfe 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
@@ -15,6 +15,7 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
@@ -25,7 +26,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index d02f9faf85d..3a50f1d4eaf 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -20,6 +20,7 @@
 import javafx.beans.property.SimpleDoubleProperty;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -38,7 +39,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 import kong.unirest.core.UnirestException;
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
index 4d32398064f..be51e77d3a8 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
@@ -16,6 +16,7 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -23,7 +24,6 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
diff --git a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
index c071c61b4ee..98ce54988ac 100644
--- a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
@@ -5,13 +5,13 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 365c846ba42..88fd54dfa0f 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -28,6 +28,7 @@
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -49,7 +50,6 @@
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 7cea2078813..100fe1c7868 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -16,11 +16,12 @@
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.search.MatchCategory;
-import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.FilteredListProxy;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.search.LuceneManager;
+import org.jabref.logic.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
@@ -34,7 +35,6 @@
 import org.jabref.model.search.matchers.MatcherSet;
 import org.jabref.model.search.matchers.MatcherSets;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
 import com.tobiasdiez.easybind.EasyBind;
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 03b701a9b8c..ca591240a1b 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -25,6 +25,7 @@
 import org.jabref.gui.mergeentries.MergeEntriesAction;
 import org.jabref.gui.mergeentries.MergeWithFetchedEntryAction;
 import org.jabref.gui.preview.CopyCitationAction;
+import org.jabref.gui.preview.PreviewPreferences;
 import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
@@ -33,7 +34,6 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PreviewPreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 
diff --git a/src/main/java/org/jabref/preferences/MergeDialogPreferences.java b/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
similarity index 88%
rename from src/main/java/org/jabref/preferences/MergeDialogPreferences.java
rename to src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
index e0ab514b210..15709455d69 100644
--- a/src/main/java/org/jabref/preferences/MergeDialogPreferences.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.mergeentries;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -6,7 +6,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
-import org.jabref.gui.mergeentries.DiffMode;
 
 public class MergeDialogPreferences {
     private final ObjectProperty<DiffMode> mergeDiffMode;
@@ -17,13 +16,13 @@ public class MergeDialogPreferences {
     private final BooleanProperty mergeApplyToAllEntries;
     private final ObjectProperty<DuplicateResolverDialog.DuplicateResolverResult> allEntriesDuplicateResolverDecision;
 
-    MergeDialogPreferences(DiffMode mergeDiffMode,
-                           boolean mergeShouldShowDiff,
-                           boolean mergeShouldShowUnifiedDiff,
-                           boolean mergeHighlightWords,
-                           boolean mergeShowChangedFieldsOnly,
-                           boolean mergeApplyToAllEntries,
-                           DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
+    public MergeDialogPreferences(DiffMode mergeDiffMode,
+                                  boolean mergeShouldShowDiff,
+                                  boolean mergeShouldShowUnifiedDiff,
+                                  boolean mergeHighlightWords,
+                                  boolean mergeShowChangedFieldsOnly,
+                                  boolean mergeApplyToAllEntries,
+                                  DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
         this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode);
         this.mergeShouldShowDiff = new SimpleBooleanProperty(mergeShouldShowDiff);
         this.mergeShouldShowUnifiedDiff = new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
index a90588d7df9..d0a7c0de7a4 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Control?>
 <?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.Control?>
-<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
-<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.layout.VBox?>
 <DialogPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
             fx:controller="org.jabref.gui.mergeentries.MultiMergeEntriesView"
             prefHeight="500.0" prefWidth="800.0">
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
index 3b8fabde4c1..8abb03252b9 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.net.URI;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.model.entry.identifier.DOI;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
index 24be429302a..221ce61c7f8 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.BibEntryPreferences;
 
 public class FieldMergerFactory {
     private final BibEntryPreferences bibEntryPreferences;
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
index 8e7e7540767..2a453106a6f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
@@ -2,9 +2,9 @@
 
 import java.util.Objects;
 
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.BibEntryPreferences;
 
 /**
  * A merger for the {@link StandardField#KEYWORDS} field
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
index 810b468d2b9..5fb3967c74e 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
@@ -14,10 +14,10 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.util.StringConverter;
 
+import org.jabref.gui.mergeentries.MergeDialogPreferences;
 import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter.BasicDiffMethod;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.MergeDialogPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
index f7020aa2d25..beb8516bf90 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
@@ -14,7 +14,6 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.textfield.CustomTextField?>
-
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" minHeight="-Infinity" minWidth="-Infinity" prefHeight="550.0"
             prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.171"
             fx:controller="org.jabref.gui.openoffice.StyleSelectDialogView">
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index e2a5f9e8a0c..faa88db0799 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -20,6 +20,7 @@
 import javafx.scene.control.TextArea;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -36,7 +37,6 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class StyleSelectDialogViewModel {
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
index abde765635a..820cb029eec 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.dlsc.unitfx.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import org.controlsfx.control.textfield.*?>
-
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<?import org.controlsfx.control.SearchableComboBox?>
-
 <?import com.dlsc.gemsfx.ResizableTextArea?>
+<?import com.dlsc.unitfx.IntegerInputField?>
+<?import org.controlsfx.control.SearchableComboBox?>
+<?import org.controlsfx.control.textfield.CustomPasswordField?>
 <fx:root
         spacing="10.0"
         type="VBox"
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index d557ef919c3..4c5153c8352 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -15,8 +15,8 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.ai.AiProvider;
-import org.jabref.preferences.ai.EmbeddingModel;
+import org.jabref.model.ai.AiProvider;
+import org.jabref.model.ai.EmbeddingModel;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.dlsc.gemsfx.ResizableTextArea;
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 031803d9f73..677ab5deb29 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -20,13 +20,13 @@
 
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.ai.AiDefaultPreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.LocalizedNumbers;
+import org.jabref.model.ai.AiProvider;
+import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.ai.AiPreferences;
-import org.jabref.preferences.ai.AiProvider;
-import org.jabref.preferences.ai.EmbeddingModel;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
 import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
index feabcb4438c..eedec97a45f 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -9,8 +9,8 @@
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 5669d8aacb0..0a705c46656 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -11,12 +11,12 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.gui.entryeditor.MrDlibPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.MrDlibPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
index f8b278b9708..00717280eaf 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -11,11 +11,11 @@
 
 import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.logic.exporter.ExportPreferences;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.SaveOrder;
-import org.jabref.preferences.ExportPreferences;
 
 public class ExportTabViewModel implements PreferenceTabViewModel {
 
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
index 537ebdbfa6d..8595bdc1460 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -15,8 +15,10 @@
 import javafx.scene.control.DialogPane;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.push.PushToApplication;
+import org.jabref.gui.push.PushToApplicationPreferences;
 import org.jabref.gui.push.PushToApplicationSettings;
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.push.PushToEmacs;
@@ -24,9 +26,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.push.CitationCommandString;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
index 65d2b28a780..b5b26269e45 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -8,11 +8,11 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index b02f2c975c5..ba7d96fc292 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -20,6 +20,8 @@
 import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.frame.UiMessageHandler;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -28,6 +30,7 @@
 import org.jabref.gui.theme.ThemeTypes;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ssl.TrustStoreManager;
@@ -39,10 +42,7 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.WorkspacePreferences;
 
 import com.airhacks.afterburner.injection.Injector;
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml
index ad62f73a086..f909ee6a3d6 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml
@@ -2,8 +2,8 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.TableColumn?>
@@ -81,7 +81,7 @@
             </graphic>
         </Button>
     </HBox>
-    
+
     <HBox alignment="CENTER_LEFT" spacing="10.0">
         <CheckBox fx:id="useFJournal" text="%Use the field FJournal to store the full journal name for (un)abbreviations in the entry"/>
     </HBox>
diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
index eed0c6c094f..8192c4c46d0 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -13,11 +13,11 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.AutoLinkPreferences;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index ad98d654549..0e581a6d3fe 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.InternalPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ProxyPreferences;
 import org.jabref.logic.net.ProxyRegisterer;
@@ -30,7 +31,6 @@
 import org.jabref.logic.net.ssl.TrustStoreManager;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
index ccc0ba7ef23..dcef02aaa9f 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -29,6 +29,7 @@
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.gui.preview.PreviewPreferences;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.logic.bst.BstPreviewLayout;
@@ -40,7 +41,6 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.PreviewPreferences;
 
 import com.airhacks.afterburner.injection.Injector;
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
index 7802e7fde1b..31fd6e6b1f6 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
@@ -11,12 +11,12 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.util.StandardFileType;
-import org.jabref.preferences.FilePreferences;
 
 public class NewProtectedTermsFileDialog extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
index d1f1ea61972..554d017420d 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -15,6 +15,7 @@
 import javafx.scene.control.TextArea;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -27,7 +28,6 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 9e2611abba8..d2dc3aa6fd3 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -22,6 +22,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.slr.StudyCatalogItem;
@@ -36,7 +37,6 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.FetcherApiKey;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import kong.unirest.core.UnirestException;
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index 6fe95f936fe..c0ca5dfc6f9 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -31,7 +31,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PreviewPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/gui/preview/PreviewPreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/PreviewPreferences.java
rename to src/main/java/org/jabref/gui/preview/PreviewPreferences.java
index 3d607724dc7..85b98a01ec4 100644
--- a/src/main/java/org/jabref/preferences/PreviewPreferences.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.preview;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index ecaee7b432d..940d6b9b240 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -15,7 +15,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/src/main/java/org/jabref/gui/push/PushToApplication.java
index defe018f0c1..18e012e904f 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplication.java
@@ -6,7 +6,6 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 /**
  * Class that defines interaction with an external application in the form of "pushing" selected entries to it.
diff --git a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java b/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
rename to src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
index 61c559a8b3d..7b569f73691 100644
--- a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.gui.push;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index f0846330e3d..ab84a7a9917 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -12,11 +12,10 @@
 import javafx.scene.layout.Priority;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 public class PushToApplicationSettings {
 
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/src/main/java/org/jabref/gui/push/PushToEmacs.java
index 923de3aa28c..9ff8f13cbc3 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -14,7 +14,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
index c60ad74f38b..af9573c18d1 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
@@ -4,9 +4,8 @@
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 public class PushToEmacsSettings extends PushToApplicationSettings {
 
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index b5e9018701e..e68a5bc75ea 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -15,7 +15,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
index 19d258990c8..e476082c39f 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.push;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 public class PushToLyxSettings extends PushToApplicationSettings {
 
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index 8f395775134..fb05078019a 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -13,7 +13,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/push/PushToVimSettings.java b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
index 08ac9c9abfe..b0d24da9d87 100644
--- a/src/main/java/org/jabref/gui/push/PushToVimSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
@@ -4,9 +4,8 @@
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 public class PushToVimSettings extends PushToApplicationSettings {
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 042724fdaf8..ad971935ab5 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -59,11 +59,11 @@
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.entry.Author;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SearchPreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 import impl.org.controlsfx.skin.AutoCompletePopup;
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.fxml b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.fxml
index dc58788cdd9..7d96e864305 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.fxml
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.fxml
@@ -5,8 +5,8 @@
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.ToggleButton?>
 <?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <DialogPane xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="org.jabref.gui.search.GlobalSearchResultDialog"
             prefHeight="400.0" prefWidth="600.0">
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
index a6bf51618bf..7c267c2396c 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
@@ -3,8 +3,8 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.SearchPreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index c7a716d97c8..4f9d9ddbc3c 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -20,12 +20,12 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
+import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SidePanePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
index 087a53db78f..864a3e70591 100644
--- a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
+++ b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
@@ -2,7 +2,7 @@
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.preferences.SidePanePreferences;
+import org.jabref.gui.frame.SidePanePreferences;
 
 public class TogglePaneAction extends SimpleCommand {
     private final StateManager stateManager;
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index 2193ed8fb4c..8080c64990a 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -16,6 +16,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.logic.crawler.StudyRepository;
 import org.jabref.logic.crawler.StudyYamlParser;
 import org.jabref.logic.git.GitHandler;
@@ -32,7 +33,6 @@
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
 import org.jabref.model.study.StudyQuery;
-import org.jabref.preferences.WorkspacePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index 03320fec6d3..eda4b251f90 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -17,13 +17,13 @@
 import javafx.scene.Scene;
 import javafx.scene.web.WebEngine;
 
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.WorkspacePreferences;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/logic/InternalPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/InternalPreferences.java
rename to src/main/java/org/jabref/logic/InternalPreferences.java
index 1850f23492a..722446408a3 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/logic/InternalPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.logic;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/org/jabref/preferences/LibraryPreferences.java b/src/main/java/org/jabref/logic/LibraryPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/LibraryPreferences.java
rename to src/main/java/org/jabref/logic/LibraryPreferences.java
index 6ccb51e6697..64ca8501de0 100644
--- a/src/main/java/org/jabref/preferences/LibraryPreferences.java
+++ b/src/main/java/org/jabref/logic/LibraryPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.logic;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index 206fa0ae57d..0beb26c3912 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.preferences.ai.AiProvider;
-import org.jabref.preferences.ai.EmbeddingModel;
+import org.jabref.model.ai.AiProvider;
+import org.jabref.model.ai.EmbeddingModel;
 
 public class AiDefaultPreferences {
     public static final Map<AiProvider, List<String>> AVAILABLE_CHAT_MODELS = Map.of(
diff --git a/src/main/java/org/jabref/preferences/ai/AiPreferences.java b/src/main/java/org/jabref/logic/ai/AiPreferences.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/ai/AiPreferences.java
rename to src/main/java/org/jabref/logic/ai/AiPreferences.java
index 53f13f210a1..15671fbae61 100644
--- a/src/main/java/org/jabref/preferences/ai/AiPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences.ai;
+package org.jabref.logic.ai;
 
 import java.util.List;
 import java.util.Objects;
@@ -15,7 +15,8 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import org.jabref.logic.ai.AiDefaultPreferences;
+import org.jabref.model.ai.AiProvider;
+import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.strings.StringUtil;
 
 import com.github.javakeyring.Keyring;
diff --git a/src/main/java/org/jabref/logic/ai/AiService.java b/src/main/java/org/jabref/logic/ai/AiService.java
index c89620d6694..b4b77c02ba0 100644
--- a/src/main/java/org/jabref/logic/ai/AiService.java
+++ b/src/main/java/org/jabref/logic/ai/AiService.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.ai.chatting.AiChatService;
 import org.jabref.logic.ai.chatting.model.JabRefChatLanguageModel;
 import org.jabref.logic.ai.ingestion.IngestionService;
@@ -18,8 +19,6 @@
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 2aacd133db7..8a802847d5b 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -9,6 +9,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.ai.AiDefaultPreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.ingestion.FileEmbeddingsManager;
 import org.jabref.logic.ai.util.ErrorMessage;
 import org.jabref.model.database.BibDatabaseContext;
@@ -16,7 +17,6 @@
 import org.jabref.model.entry.CanonicalBibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.ListUtil;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.chain.Chain;
 import dev.langchain4j.chain.ConversationalRetrievalChain;
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
index 7309a422add..d12b20ec502 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
@@ -5,9 +5,9 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.segment.TextSegment;
diff --git a/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java b/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
index 5e9c424e3ab..765c395f146 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
@@ -7,9 +7,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.chatting.AiChatLogic;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.ai.AiPreferences;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dev.langchain4j.data.message.AiMessage;
diff --git a/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java b/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
index 06b029b6551..023a503d2aa 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
@@ -3,7 +3,7 @@
 import java.net.http.HttpClient;
 import java.util.List;
 
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.ChatMessage;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java b/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
index c366874885f..a9a4063a80d 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
@@ -6,8 +6,8 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.segment.TextSegment;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
index 71d848cd4de..2fdf6f128b9 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
@@ -8,6 +8,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.util.Pair;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.ai.processingstatus.ProcessingInfo;
 import org.jabref.logic.ai.processingstatus.ProcessingState;
 import org.jabref.logic.l10n.Localization;
@@ -16,7 +17,6 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
index f2df0ab1299..719f5b3dc3a 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
@@ -9,12 +9,12 @@
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import dev.langchain4j.data.document.Document;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
index ef4262f45a9..cd3d08621a0 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
@@ -8,13 +8,13 @@
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.StringProperty;
 
+import org.jabref.gui.FilePreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.processingstatus.ProcessingInfo;
 import org.jabref.logic.ai.processingstatus.ProcessingState;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java b/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
index 28589cb053c..fb1d08034b4 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
@@ -5,7 +5,7 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.document.DocumentSplitter;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java b/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
index 27a505b1fb1..526ade268d1 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
@@ -8,10 +8,10 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
-import org.jabref.preferences.ai.AiPreferences;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java b/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
index 1558feaa1a9..bdf5b928973 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
@@ -8,7 +8,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 import ai.djl.MalformedModelException;
 import ai.djl.huggingface.translator.TextEmbeddingTranslatorFactory;
diff --git a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index 7a4550e22d4..03a3b63d975 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -10,14 +10,14 @@
 
 import javafx.beans.property.BooleanProperty;
 
+import org.jabref.gui.FilePreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.ingestion.FileToDocument;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
 
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.document.DocumentSplitter;
diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
index 59c87fd3a79..97cc6053090 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -13,8 +13,8 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ai.AiPreferences;
+import org.jabref.gui.FilePreferences;
+import org.jabref.logic.ai.AiPreferences;
 
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/logic/ai/summarization/Summary.java b/src/main/java/org/jabref/logic/ai/summarization/Summary.java
index eb2ee4d314d..f96ab60a6f6 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/Summary.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/Summary.java
@@ -3,6 +3,6 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import org.jabref.preferences.ai.AiProvider;
+import org.jabref.model.ai.AiProvider;
 
 public record Summary(LocalDateTime timestamp, AiProvider aiProvider, String model, String content) implements Serializable { }
diff --git a/src/main/java/org/jabref/preferences/CleanupPreferences.java b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
similarity index 92%
rename from src/main/java/org/jabref/preferences/CleanupPreferences.java
rename to src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
index dec2183eba6..cda23a6d57f 100644
--- a/src/main/java/org/jabref/preferences/CleanupPreferences.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.logic.cleanup;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -9,8 +9,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
-import org.jabref.logic.cleanup.FieldFormatterCleanups;
-
 public class CleanupPreferences {
 
     private final ObservableSet<CleanupStep> activeJobs;
@@ -49,7 +47,7 @@ public void setActive(CleanupStep job, boolean value) {
         }
     }
 
-    protected ObservableSet<CleanupStep> getObservableActiveJobs() {
+    public ObservableSet<CleanupStep> getObservableActiveJobs() {
         return activeJobs;
     }
 
@@ -66,7 +64,7 @@ public FieldFormatterCleanups getFieldFormatterCleanups() {
         return fieldFormatterCleanups.get();
     }
 
-    protected ObjectProperty<FieldFormatterCleanups> fieldFormatterCleanupsProperty() {
+    public ObjectProperty<FieldFormatterCleanups> fieldFormatterCleanupsProperty() {
         return fieldFormatterCleanups;
     }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index d6e642f9b7b..27ffeaa4c36 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -4,12 +4,11 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.CleanupPreferences;
-import org.jabref.preferences.FilePreferences;
 
 public class CleanupWorker {
 
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index 4fad8316175..63644a22d3d 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -6,13 +6,13 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
index 77d8f7a6ae9..d67197575b8 100644
--- a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
@@ -7,12 +7,12 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 public class RelativePathsCleanup implements CleanupJob {
 
diff --git a/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java b/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
index 1d2c009aa95..09d64db1c19 100644
--- a/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
+++ b/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
@@ -7,12 +7,12 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 
 public class RemoveLinksToNotExistentFiles implements CleanupJob {
     private final BibDatabaseContext databaseContext;
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index c9d04e14596..1f52e15560e 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -7,13 +7,13 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java b/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
index 39b2343c665..dcdcaafef5d 100644
--- a/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
@@ -24,13 +24,13 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/main/java/org/jabref/preferences/ExportPreferences.java b/src/main/java/org/jabref/logic/exporter/ExportPreferences.java
similarity index 96%
rename from src/main/java/org/jabref/preferences/ExportPreferences.java
rename to src/main/java/org/jabref/logic/exporter/ExportPreferences.java
index 1e653f45c8a..5c6be44c407 100644
--- a/src/main/java/org/jabref/preferences/ExportPreferences.java
+++ b/src/main/java/org/jabref/logic/exporter/ExportPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.logic.exporter;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -10,7 +10,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.model.metadata.SaveOrder;
 
 public class ExportPreferences {
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 61e1c5751ae..548e63e0b86 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -6,12 +6,12 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.FileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 public abstract class Exporter {
 
diff --git a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
index 8a3c272d6ec..305e939fe65 100644
--- a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
+++ b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
@@ -8,11 +8,11 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index 62319455519..9d113c6b970 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -5,7 +5,7 @@
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.model.entry.BibEntryPreferences;
 
 public record ImportFormatPreferences(
         BibEntryPreferences bibEntryPreferences,
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 85dabf130bc..3bbe7bc0bf9 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -8,6 +8,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.fetcher.ACMPortalFetcher;
 import org.jabref.logic.importer.fetcher.ACS;
 import org.jabref.logic.importer.fetcher.ApsFetcher;
@@ -53,7 +54,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Identifier;
-import org.jabref.preferences.FilePreferences;
 
 import static org.jabref.model.entry.field.StandardField.DOI;
 import static org.jabref.model.entry.field.StandardField.EPRINT;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index ba12ac0d9aa..95603cff96e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.entryeditor.MrDlibPreferences;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -19,7 +20,6 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.MrDlibPreferences;
 
 import org.apache.hc.core5.net.URIBuilder;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
index 75c3c4a503e..81b1de23b65 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -10,6 +10,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -26,7 +27,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
index 0ed0bb82d10..00ab100663a 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
@@ -4,13 +4,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index 70d4fc6a568..0157ebc28b4 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -6,12 +6,12 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.FilePreferences;
 
 public class FileChecker implements ValueChecker {
 
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 77fbf455d6b..a4784816b30 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -4,13 +4,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 
 public class IntegrityCheck {
 
diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
index 5f22139593c..2dab7893abb 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -6,11 +6,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.pdf.FileAnnotation;
-import org.jabref.preferences.FilePreferences;
 
 /**
  * Here all PDF files attached to a BibEntry are scanned for annotations using a PdfAnnotationImporter.
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index a9becd355ca..062d0d9dd42 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -4,10 +4,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.FileAnnotation;
-import org.jabref.preferences.FilePreferences;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 3475a639c0a..0fe6c09450b 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -5,12 +5,12 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchQuery;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/logic/search/LuceneManager.java b/src/main/java/org/jabref/logic/search/LuceneManager.java
index ec591ae592c..ebb747b4508 100644
--- a/src/main/java/org/jabref/logic/search/LuceneManager.java
+++ b/src/main/java/org/jabref/logic/search/LuceneManager.java
@@ -7,6 +7,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.search.indexing.BibFieldsIndexer;
 import org.jabref.logic.search.indexing.DefaultLinkedFilesIndexer;
 import org.jabref.logic.search.indexing.ReadOnlyLinkedFilesIndexer;
@@ -22,7 +23,6 @@
 import org.jabref.model.search.event.IndexClosedEvent;
 import org.jabref.model.search.event.IndexRemovedEvent;
 import org.jabref.model.search.event.IndexStartedEvent;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/preferences/SearchPreferences.java b/src/main/java/org/jabref/logic/search/SearchPreferences.java
similarity index 98%
rename from src/main/java/org/jabref/preferences/SearchPreferences.java
rename to src/main/java/org/jabref/logic/search/SearchPreferences.java
index ad120128745..07a687c75ee 100644
--- a/src/main/java/org/jabref/preferences/SearchPreferences.java
+++ b/src/main/java/org/jabref/logic/search/SearchPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.logic.search;
 
 import java.util.EnumSet;
 
@@ -11,7 +11,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
-import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.model.search.SearchFlags;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java b/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
index 9e4799e3bf6..a77d44b2bed 100644
--- a/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
+++ b/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
@@ -16,6 +16,7 @@
 
 import javafx.util.Pair;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
@@ -26,7 +27,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.search.LuceneIndexer;
 import org.jabref.model.search.SearchFieldConstants;
-import org.jabref.preferences.FilePreferences;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.document.Document;
diff --git a/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java b/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
index 25264cc0770..d26aad3ca11 100644
--- a/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
+++ b/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -17,7 +18,6 @@
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.search.SearchResult;
 import org.jabref.model.search.SearchResults;
-import org.jabref.preferences.FilePreferences;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.MultiReader;
diff --git a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
index 4f816ef624d..566a617c4b6 100644
--- a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
+++ b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
@@ -10,10 +10,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.FilePreferences;
 
 /**
  * Search class for files. <br>
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index e128beb06b8..7a9c1d4db8a 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -22,6 +22,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.citationkeypattern.BracketedPattern;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
@@ -29,7 +30,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index e89db8fda64..e27e73948e5 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.shared.security.Password;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -29,7 +30,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.github.javakeyring.Keyring;
diff --git a/src/main/java/org/jabref/preferences/ai/AiProvider.java b/src/main/java/org/jabref/model/ai/AiProvider.java
similarity index 91%
rename from src/main/java/org/jabref/preferences/ai/AiProvider.java
rename to src/main/java/org/jabref/model/ai/AiProvider.java
index 69c3405249d..e93c6ecbfc1 100644
--- a/src/main/java/org/jabref/preferences/ai/AiProvider.java
+++ b/src/main/java/org/jabref/model/ai/AiProvider.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences.ai;
+package org.jabref.model.ai;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/jabref/preferences/ai/EmbeddingModel.java b/src/main/java/org/jabref/model/ai/EmbeddingModel.java
similarity index 99%
rename from src/main/java/org/jabref/preferences/ai/EmbeddingModel.java
rename to src/main/java/org/jabref/model/ai/EmbeddingModel.java
index 94fd7031222..262aea87847 100644
--- a/src/main/java/org/jabref/preferences/ai/EmbeddingModel.java
+++ b/src/main/java/org/jabref/model/ai/EmbeddingModel.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences.ai;
+package org.jabref.model.ai;
 
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 901e5e69782..0508da77b43 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -10,6 +10,7 @@
 import java.util.UUID;
 
 import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.crawler.Crawler;
 import org.jabref.logic.crawler.StudyRepository;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -20,7 +21,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.study.Study;
-import org.jabref.preferences.FilePreferences;
 
 import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/jabref/preferences/BibEntryPreferences.java b/src/main/java/org/jabref/model/entry/BibEntryPreferences.java
similarity index 95%
rename from src/main/java/org/jabref/preferences/BibEntryPreferences.java
rename to src/main/java/org/jabref/model/entry/BibEntryPreferences.java
index 0fb17bb413f..1e2caadc856 100644
--- a/src/main/java/org/jabref/preferences/BibEntryPreferences.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryPreferences.java
@@ -1,4 +1,4 @@
-package org.jabref.preferences;
+package org.jabref.model.entry;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index b5869275f6f..2ae4890df30 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -19,13 +19,13 @@
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index eeb606c08e3..86f94bc2557 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -35,13 +35,20 @@
 import javafx.collections.SetChangeListener;
 import javafx.scene.control.TableColumn.SortType;
 
+import org.jabref.gui.FilePreferences;
+import org.jabref.gui.GuiPreferences;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.gui.entryeditor.MrDlibPreferences;
+import org.jabref.gui.externalfiles.UnlinkedFilesDialogPreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
+import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -52,12 +59,18 @@
 import org.jabref.gui.maintable.NameDisplayPreferences.AbbreviationStyle;
 import org.jabref.gui.maintable.NameDisplayPreferences.DisplayStyle;
 import org.jabref.gui.mergeentries.DiffMode;
+import org.jabref.gui.mergeentries.MergeDialogPreferences;
+import org.jabref.gui.preview.PreviewPreferences;
+import org.jabref.gui.push.PushToApplicationPreferences;
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.sidepane.SidePaneType;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.gui.theme.Theme;
+import org.jabref.logic.InternalPreferences;
 import org.jabref.logic.JabRefException;
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.ai.AiDefaultPreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bst.BstPreviewLayout;
 import org.jabref.logic.citationkeypattern.CitationKeyPattern;
@@ -65,8 +78,10 @@
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
+import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.exporter.BibDatabaseWriter;
+import org.jabref.logic.exporter.ExportPreferences;
 import org.jabref.logic.exporter.MetaDataSerializer;
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.exporter.TemplateExporter;
@@ -106,6 +121,8 @@
 import org.jabref.logic.push.CitationCommandString;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.shared.security.Password;
 import org.jabref.logic.util.Directories;
@@ -114,7 +131,10 @@
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.logic.util.io.FileHistory;
 import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.ai.AiProvider;
+import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
@@ -128,9 +148,6 @@
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.ai.AiPreferences;
-import org.jabref.preferences.ai.AiProvider;
-import org.jabref.preferences.ai.EmbeddingModel;
 
 import com.airhacks.afterburner.injection.Injector;
 import com.github.javakeyring.Keyring;
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index ea7e99c99fd..4541e148368 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -4,17 +4,32 @@
 import java.util.Map;
 import java.util.prefs.BackingStoreException;
 
+import org.jabref.gui.FilePreferences;
+import org.jabref.gui.GuiPreferences;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.gui.entryeditor.MrDlibPreferences;
+import org.jabref.gui.externalfiles.UnlinkedFilesDialogPreferences;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
+import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
 import org.jabref.gui.maintable.NameDisplayPreferences;
+import org.jabref.gui.mergeentries.MergeDialogPreferences;
+import org.jabref.gui.preview.PreviewPreferences;
+import org.jabref.gui.push.PushToApplicationPreferences;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
+import org.jabref.logic.InternalPreferences;
 import org.jabref.logic.JabRefException;
+import org.jabref.logic.LibraryPreferences;
+import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
+import org.jabref.logic.cleanup.CleanupPreferences;
+import org.jabref.logic.exporter.ExportPreferences;
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -30,10 +45,11 @@
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
 import org.jabref.logic.remote.RemotePreferences;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.ai.AiPreferences;
 
 import org.jvnet.hk2.annotations.Contract;
 
diff --git a/src/main/resources/xslt/mathml_latex/entities.xsl b/src/main/resources/xslt/mathml_latex/entities.xsl
index 3b4338152a5..e899ae04357 100644
--- a/src/main/resources/xslt/mathml_latex/entities.xsl
+++ b/src/main/resources/xslt/mathml_latex/entities.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:m="http://www.w3.org/1998/Math/MathML"
-                version='1.0'>
+<xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version='1.0'>
 
 <!-- ====================================================================== -->
 <!-- $id: entities.xsl, 2002/22/11 Exp $
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index 6d32723d2ee..f408333a667 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -9,13 +9,15 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.cli.ArgumentProcessor.Mode;
-import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.exporter.BibDatabaseWriter;
+import org.jabref.logic.exporter.ExportPreferences;
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
+import org.jabref.logic.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
@@ -23,9 +25,7 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.ExportPreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SearchPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index ed08b268cfe..c4491332ee1 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.Directories;
@@ -18,7 +19,6 @@
 import org.jabref.model.groups.event.GroupUpdatedEvent;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
index b6af316427d..9002c54d7a9 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.JabRefDialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.push.CitationCommandString;
@@ -20,7 +21,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
index ecb365d5715..e95b267dc2b 100644
--- a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
@@ -7,9 +7,9 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
index 066548b9ee0..7d563703124 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
@@ -2,8 +2,8 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.preferences.PreferencesService;
 
diff --git a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
index d5764a77b66..33daa46b48d 100644
--- a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
@@ -8,6 +8,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.CitationFetcher;
 import org.jabref.gui.externalfiles.ImportHandler;
@@ -26,7 +27,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index 094b39a12a7..839e36061be 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -10,7 +10,9 @@
 
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.exporter.Exporter;
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Localization;
@@ -24,8 +26,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
-import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index 9f541d58efe..ffffdfcf5e2 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -11,13 +11,16 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
 import org.jabref.logic.exporter.BibDatabaseWriter;
+import org.jabref.logic.exporter.ExportPreferences;
 import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.model.database.BibDatabase;
@@ -27,10 +30,7 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
-import org.jabref.preferences.ExportPreferences;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
-import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index a609b37ab3c..16a3d8c8b8d 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -8,13 +8,13 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
index 0e251c13c89..2571a8f126d 100644
--- a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
@@ -7,6 +7,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.logic.bibtex.FieldPreferences;
@@ -20,7 +21,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
index 1cc0cb240ff..a514c67d1be 100644
--- a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
@@ -5,12 +5,12 @@
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.util.FileNodeViewModel;
 import org.jabref.logic.externalfiles.DateRange;
 import org.jabref.logic.externalfiles.ExternalFileSorter;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
index 8ca169a8fe4..9b51c68059d 100644
--- a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
+++ b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
@@ -7,9 +7,9 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index e8dc610fa07..fd64f7a37d6 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -17,17 +17,17 @@
 import javafx.scene.control.DialogPane;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
+import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.testutils.category.GUITest;
 
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
index 8396ef46d33..2c345a56262 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
@@ -9,6 +9,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.autocompleter.EmptySuggestionProvider;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -16,7 +17,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.testutils.category.FetcherTest;
 
diff --git a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index 71c44d39e48..555e7b452ac 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -5,14 +5,14 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.StateManager;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.BibEntryPreferences;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index 0ccc98a40ef..d732945ed73 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -9,8 +9,8 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.DroppingMouseLocation;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
+import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
diff --git a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
index 18d16c731e3..40f94048802 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -5,10 +5,10 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
index 21507cdd8a7..3fe3617db9e 100644
--- a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
+++ b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
@@ -14,13 +14,13 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.FilePreferences;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
index 02a4dcd68a4..712897b3db4 100644
--- a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
@@ -5,11 +5,11 @@
 import org.jabref.gui.mergeentries.newmergedialog.FieldRowViewModel;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.jbibtex.ParseException;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
index b690f5d5290..6b0f0cc35d9 100644
--- a/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
@@ -3,7 +3,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
-import org.jabref.preferences.FilePreferences;
+import org.jabref.gui.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
index 72e64bd75b1..52702a86957 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
@@ -14,12 +14,12 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
-import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
+import org.jabref.logic.util.TaskExecutor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
index 0d37641734f..e5d55c54157 100644
--- a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
@@ -9,8 +9,9 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.preferences.ExternalApplicationsPreferences;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
+import org.jabref.logic.util.OS;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
diff --git a/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java b/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
index 1e1e6acf710..c48a29213b9 100644
--- a/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
@@ -7,10 +7,9 @@
 import javafx.collections.ObservableMap;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.push.CitationCommandString;
-import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.PushToApplicationPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index 393429d23f7..eef6f59ab80 100644
--- a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -15,10 +15,10 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SearchPreferences;
 import org.jabref.testutils.category.GUITest;
 
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 0d0e997a250..88eec183bc2 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -14,6 +14,7 @@
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
+import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -21,7 +22,6 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-import org.jabref.preferences.SidePanePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
index b92d8a8cd02..537616b8b99 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -4,11 +4,11 @@
 import java.util.List;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
-import org.jabref.preferences.WorkspacePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
index 92d1fa7a7e5..1395ac401cd 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -13,9 +13,9 @@
 import javafx.scene.Scene;
 import javafx.scene.web.WebEngine;
 
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.WorkspacePreferences;
 import org.jabref.support.DisabledOnCIServer;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/http/server/ServerTest.java b/src/test/java/org/jabref/http/server/ServerTest.java
index 099c9fd88b0..8f913081d0d 100644
--- a/src/test/java/org/jabref/http/server/ServerTest.java
+++ b/src/test/java/org/jabref/http/server/ServerTest.java
@@ -6,11 +6,11 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.GuiPreferences;
 import org.jabref.http.dto.GsonFactory;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.preferences.BibEntryPreferences;
-import org.jabref.preferences.GuiPreferences;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.gson.Gson;
diff --git a/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java b/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
index 3bc66e16b8a..fc8a6be2ccd 100644
--- a/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 
-import org.jabref.gui.DialogService;
 import org.jabref.logic.ai.chatting.chathistory.storages.MVStoreChatHistoryStorage;
 import org.jabref.logic.util.NotificationService;
 
diff --git a/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java b/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
index 5af99ac0d59..45f1d9bdb05 100644
--- a/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
@@ -4,7 +4,7 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
-import org.jabref.preferences.ai.AiProvider;
+import org.jabref.model.ai.AiProvider;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 9f75580446b..70cda980609 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.LatexCleanupFormatter;
@@ -28,8 +29,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.CleanupPreferences;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index 9493d20df5c..3a3d0368667 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -2,12 +2,11 @@
 
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.CleanupPreferences;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index a9f576d4447..b329b6e431b 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -16,7 +17,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java b/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
index 0529750bb4c..1a1a61fe70c 100644
--- a/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
@@ -5,6 +5,7 @@
 import java.nio.file.Path;
 import java.util.List;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -14,7 +15,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index 2ddfee970d5..06ad3c6b174 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -6,6 +6,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -13,7 +14,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
index e4e7faa1060..e7dd854127f 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -10,6 +10,7 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -27,7 +28,6 @@
 import org.jabref.model.study.FetchResult;
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
index 325d59214f9..58356585030 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -8,6 +8,7 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.PdfEmbeddedBibFileImporter;
@@ -21,7 +22,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.FilePreferences;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
diff --git a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
index 8ac21700682..e70945e89f3 100644
--- a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
@@ -13,8 +13,8 @@
 import org.jabref.logic.importer.fileformat.EndnoteXmlImporter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
index a98eccd58db..d93a13b9fce 100644
--- a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
@@ -7,9 +7,9 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
index 6c147d40112..2fb783d02cd 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
@@ -13,8 +13,8 @@
 import org.jabref.logic.importer.fileformat.ModsImporter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.BibEntryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index c1279e2b3e1..80bf964da7e 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -9,6 +9,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -23,7 +24,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.preferences.FilePreferences;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index c170b9e16a2..0819e423d3e 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -8,12 +8,12 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import org.jabref.logic.LibraryPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index ba033cb070e..99d24a6b55b 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
 import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
 import org.jabref.logic.importer.fetcher.GoogleScholar;
@@ -18,7 +19,6 @@
 import org.jabref.logic.importer.fetcher.isbntobibtex.EbookDeIsbnFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.OpenLibraryIsbnFetcher;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.FilePreferences;
 
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfoList;
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
index 684e01ecc63..47f260b4b9b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
@@ -6,8 +6,8 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
index 53911234bd3..e0e3055e00d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -5,9 +5,9 @@
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
index b6dab92086e..6f8f4847797 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -2,11 +2,11 @@
 
 import java.util.List;
 
+import org.jabref.gui.entryeditor.MrDlibPreferences;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.util.Version;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.MrDlibPreferences;
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 1f6b9a5f84b..1c5a9f09321 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -8,6 +8,7 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -23,7 +24,6 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index eaef05673e7..fd2f2498df3 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.pdf.FileAnnotation;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
index 532c5595007..cda61dce4fa 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -7,6 +7,7 @@
 
 import javafx.beans.property.BooleanProperty;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
@@ -15,7 +16,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
index 73242a72aa8..8d48825cbff 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
@@ -8,6 +8,7 @@
 
 import javafx.beans.property.SimpleBooleanProperty;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -22,7 +23,6 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.FilePreferences;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java b/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
index 173020877d6..a48f3fe42ba 100644
--- a/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
+++ b/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -13,7 +14,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.search.LuceneIndexer;
-import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.apache.lucene.index.IndexReader;
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 5858818b15e..00c97965e0c 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -12,11 +12,12 @@
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.FilePreferences;
+import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 7224d4a1864..646d90b7c5e 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -6,11 +6,11 @@
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.FilePreferences;
 import org.jabref.logic.util.Directories;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.preferences.FilePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;