diff --git a/plugins/bg/src/main/kotlin/app/termora/plugins/bg/BackgroundOption.kt b/plugins/bg/src/main/kotlin/app/termora/plugins/bg/BackgroundOption.kt
index 7cacd9c..bcbbaab 100644
--- a/plugins/bg/src/main/kotlin/app/termora/plugins/bg/BackgroundOption.kt
+++ b/plugins/bg/src/main/kotlin/app/termora/plugins/bg/BackgroundOption.kt
@@ -2,10 +2,7 @@ package app.termora.plugins.bg
 
 import app.termora.*
 import app.termora.OptionsPane.Companion.FORM_MARGIN
-import app.termora.database.DatabaseManager
-import app.termora.nv.FileChooser
 import com.formdev.flatlaf.extras.components.FlatButton
-import com.formdev.flatlaf.extras.components.FlatTextPane
 import com.jgoodies.forms.builder.FormBuilder
 import com.jgoodies.forms.layout.FormLayout
 import org.apache.commons.io.FileUtils
diff --git a/plugins/sync/src/main/kotlin/app/termora/plugins/sync/CloudSyncOption.kt b/plugins/sync/src/main/kotlin/app/termora/plugins/sync/CloudSyncOption.kt
index 73c27a7..ca8ac4f 100644
--- a/plugins/sync/src/main/kotlin/app/termora/plugins/sync/CloudSyncOption.kt
+++ b/plugins/sync/src/main/kotlin/app/termora/plugins/sync/CloudSyncOption.kt
@@ -15,7 +15,6 @@ import app.termora.keymgr.KeyManager
 import app.termora.keymgr.OhKeyPair
 import app.termora.macro.Macro
 import app.termora.macro.MacroManager
-import app.termora.nv.FileChooser
 import app.termora.snippet.Snippet
 import app.termora.snippet.SnippetManager
 import com.formdev.flatlaf.FlatClientProperties
diff --git a/src/main/kotlin/app/termora/DialogWrapper.kt b/src/main/kotlin/app/termora/DialogWrapper.kt
index f0b1419..967b672 100644
--- a/src/main/kotlin/app/termora/DialogWrapper.kt
+++ b/src/main/kotlin/app/termora/DialogWrapper.kt
@@ -2,7 +2,6 @@ package app.termora
 
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
-import app.termora.nv.osx.NativeMacLibrary
 import com.formdev.flatlaf.FlatClientProperties
 import com.formdev.flatlaf.util.SystemInfo
 import com.jetbrains.JBR
diff --git a/src/main/kotlin/app/termora/nv/FileChooser.kt b/src/main/kotlin/app/termora/FileChooser.kt
similarity index 99%
rename from src/main/kotlin/app/termora/nv/FileChooser.kt
rename to src/main/kotlin/app/termora/FileChooser.kt
index dd9be73..da6cd93 100644
--- a/src/main/kotlin/app/termora/nv/FileChooser.kt
+++ b/src/main/kotlin/app/termora/FileChooser.kt
@@ -1,4 +1,4 @@
-package app.termora.nv
+package app.termora
 
 import com.formdev.flatlaf.util.SystemInfo
 import de.jangassen.jfa.ThreadUtils
diff --git a/src/main/kotlin/app/termora/nv/osx/NativeMacLibrary.kt b/src/main/kotlin/app/termora/NativeMacLibrary.kt
similarity index 98%
rename from src/main/kotlin/app/termora/nv/osx/NativeMacLibrary.kt
rename to src/main/kotlin/app/termora/NativeMacLibrary.kt
index 6667817..b8fcbc2 100644
--- a/src/main/kotlin/app/termora/nv/osx/NativeMacLibrary.kt
+++ b/src/main/kotlin/app/termora/NativeMacLibrary.kt
@@ -1,4 +1,4 @@
-package app.termora.nv.osx
+package app.termora
 
 import de.jangassen.jfa.foundation.Foundation
 import de.jangassen.jfa.foundation.ID
diff --git a/src/main/kotlin/app/termora/OptionPane.kt b/src/main/kotlin/app/termora/OptionPane.kt
index 9dc1960..3e940e6 100644
--- a/src/main/kotlin/app/termora/OptionPane.kt
+++ b/src/main/kotlin/app/termora/OptionPane.kt
@@ -1,6 +1,5 @@
 package app.termora
 
-import app.termora.nv.osx.NativeMacLibrary
 import com.formdev.flatlaf.FlatClientProperties
 import com.formdev.flatlaf.extras.components.FlatTextPane
 import com.formdev.flatlaf.util.SystemInfo
diff --git a/src/main/kotlin/app/termora/SettingsOptionsPane.kt b/src/main/kotlin/app/termora/SettingsOptionsPane.kt
index 12edc08..4b587f9 100644
--- a/src/main/kotlin/app/termora/SettingsOptionsPane.kt
+++ b/src/main/kotlin/app/termora/SettingsOptionsPane.kt
@@ -5,7 +5,6 @@ import app.termora.actions.AnActionEvent
 import app.termora.actions.DataProviders
 import app.termora.database.DatabaseManager
 import app.termora.keymap.KeymapPanel
-import app.termora.nv.FileChooser
 import app.termora.plugin.ExtensionManager
 import app.termora.sftp.SFTPTab
 import app.termora.terminal.CursorStyle
diff --git a/src/main/kotlin/app/termora/TermoraFrameManager.kt b/src/main/kotlin/app/termora/TermoraFrameManager.kt
index 3bcd00f..5485815 100644
--- a/src/main/kotlin/app/termora/TermoraFrameManager.kt
+++ b/src/main/kotlin/app/termora/TermoraFrameManager.kt
@@ -1,7 +1,6 @@
 package app.termora
 
 import app.termora.database.DatabaseManager
-import app.termora.nv.osx.NativeMacLibrary
 import app.termora.plugin.ExtensionManager
 import com.formdev.flatlaf.ui.FlatNativeWindowsLibrary
 import com.formdev.flatlaf.util.SystemInfo
diff --git a/src/main/kotlin/app/termora/addons/zmodem/ZModemPtyConnectorAdaptor.kt b/src/main/kotlin/app/termora/addons/zmodem/ZModemPtyConnectorAdaptor.kt
index 1b4cf36..7be71e3 100644
--- a/src/main/kotlin/app/termora/addons/zmodem/ZModemPtyConnectorAdaptor.kt
+++ b/src/main/kotlin/app/termora/addons/zmodem/ZModemPtyConnectorAdaptor.kt
@@ -1,7 +1,7 @@
 package app.termora.addons.zmodem
 
+import app.termora.FileChooser
 import app.termora.I18n
-import app.termora.nv.FileChooser
 import app.termora.terminal.ControlCharacters
 import app.termora.terminal.PtyConnectorDelegate
 import app.termora.terminal.StreamPtyConnector
diff --git a/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt b/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt
index c15ff29..78bf587 100644
--- a/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt
+++ b/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt
@@ -4,7 +4,6 @@ import app.termora.*
 import app.termora.account.AccountOwner
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
-import app.termora.nv.FileChooser
 import app.termora.plugin.internal.ssh.SSHProtocolProvider
 import app.termora.tree.Filter
 import app.termora.tree.HostTreeNode
diff --git a/src/main/kotlin/app/termora/plugin/internal/plugin/PluginOption.kt b/src/main/kotlin/app/termora/plugin/internal/plugin/PluginOption.kt
index 8391186..2713aa8 100644
--- a/src/main/kotlin/app/termora/plugin/internal/plugin/PluginOption.kt
+++ b/src/main/kotlin/app/termora/plugin/internal/plugin/PluginOption.kt
@@ -4,7 +4,6 @@ import app.termora.*
 import app.termora.account.Account
 import app.termora.account.AccountExtension
 import app.termora.account.AccountManager
-import app.termora.nv.FileChooser
 import app.termora.plugin.PluginDescriptor
 import app.termora.plugin.PluginManager
 import app.termora.plugin.PluginOrigin
diff --git a/src/main/kotlin/app/termora/tlog/TerminalLoggerAction.kt b/src/main/kotlin/app/termora/tlog/TerminalLoggerAction.kt
index 4fdf109..f62265a 100644
--- a/src/main/kotlin/app/termora/tlog/TerminalLoggerAction.kt
+++ b/src/main/kotlin/app/termora/tlog/TerminalLoggerAction.kt
@@ -4,7 +4,6 @@ import app.termora.*
 import app.termora.actions.AnAction
 import app.termora.actions.AnActionEvent
 import app.termora.database.DatabaseManager
-import app.termora.nv.FileChooser
 import com.formdev.flatlaf.extras.components.FlatPopupMenu
 import com.formdev.flatlaf.util.SystemInfo
 import org.apache.commons.io.FileUtils