diff --git a/lib/rclone.ts b/lib/rclone/api.ts
similarity index 100%
rename from lib/rclone.ts
rename to lib/rclone/api.ts
diff --git a/scripts/buildExternal.js b/scripts/buildExternal.js
index 08e65fb..0dd2d4c 100644
--- a/scripts/buildExternal.js
+++ b/scripts/buildExternal.js
@@ -40,7 +40,10 @@ async function buildExternal() {
         console.log('Cleaning up...')
         await Promise.all([
             // Remove lib/*.js files
-            execSync('rm -rf ./lib/**.js', { stdio: 'inherit', cwd: projectRoot }),
+            execSync('rm -rf ./lib/**/**.js && rm -rf ./lib/**.js', {
+                stdio: 'inherit',
+                cwd: projectRoot,
+            }),
             // Remove main.js
             unlink(join(projectRoot, 'main.js')).catch(() => {}), // Ignore if file doesn't exist
         ])
diff --git a/src/components/PathFinder.tsx b/src/components/PathFinder.tsx
index 53a229a..748e0b9 100644
--- a/src/components/PathFinder.tsx
+++ b/src/components/PathFinder.tsx
@@ -4,7 +4,7 @@ import { open } from '@tauri-apps/plugin-dialog'
 import { ArrowDownUp, FolderOpen } from 'lucide-react'
 import { useCallback, useEffect, useState } from 'react'
 import { isRemotePath } from '../../lib/fs'
-import { listPath } from '../../lib/rclone'
+import { listPath } from '../../lib/rclone/api'
 import { useStore } from '../../lib/store'
 import { lockWindows, unlockWindows } from '../../lib/window'
 
diff --git a/src/components/RemoteCreateDrawer.tsx b/src/components/RemoteCreateDrawer.tsx
index c1329ea..792298b 100644
--- a/src/components/RemoteCreateDrawer.tsx
+++ b/src/components/RemoteCreateDrawer.tsx
@@ -3,8 +3,8 @@ import { Button, DrawerContent } from '@nextui-org/react'
 import { message } from '@tauri-apps/plugin-dialog'
 import { ChevronDown, ChevronUp } from 'lucide-react'
 import { useEffect, useMemo, useState } from 'react'
-import { createRemote } from '../../lib/rclone'
-import { getBackends } from '../../lib/rclone'
+import { createRemote } from '../../lib/rclone/api'
+import { getBackends } from '../../lib/rclone/api'
 import { useStore } from '../../lib/store'
 import { triggerTrayRebuild } from '../../lib/tray'
 import type { Backend, BackendOption } from '../../types/rclone'
diff --git a/src/components/RemoteDefaultsDrawer.tsx b/src/components/RemoteDefaultsDrawer.tsx
index 436ff67..b3c6a83 100644
--- a/src/components/RemoteDefaultsDrawer.tsx
+++ b/src/components/RemoteDefaultsDrawer.tsx
@@ -20,7 +20,7 @@ import {
     getMountFlags,
     getSyncFlags,
     getVfsFlags,
-} from '../../lib/rclone'
+} from '../../lib/rclone/api'
 import { type RemoteConfig, usePersistedStore } from '../../lib/store'
 import { triggerTrayRebuild } from '../../lib/tray'
 import { lockWindows, unlockWindows } from '../../lib/window'
diff --git a/src/components/RemoteEditDrawer.tsx b/src/components/RemoteEditDrawer.tsx
index 8a99316..4314c26 100644
--- a/src/components/RemoteEditDrawer.tsx
+++ b/src/components/RemoteEditDrawer.tsx
@@ -4,7 +4,7 @@ import { Button, Input } from '@nextui-org/react'
 import { message } from '@tauri-apps/plugin-dialog'
 import { ChevronDown, ChevronUp } from 'lucide-react'
 import { useEffect, useState } from 'react'
-import { getBackends, getRemote, updateRemote } from '../../lib/rclone'
+import { getBackends, getRemote, updateRemote } from '../../lib/rclone/api'
 import type { Backend, BackendOption } from '../../types/rclone'
 
 export default function RemoteEditDrawer({
diff --git a/src/pages/Copy.tsx b/src/pages/Copy.tsx
index 8477d3e..7b1a89f 100644
--- a/src/pages/Copy.tsx
+++ b/src/pages/Copy.tsx
@@ -4,7 +4,7 @@ import { message } from '@tauri-apps/plugin-dialog'
 import { AlertOctagonIcon, CopyIcon, FilterIcon, FoldersIcon, PlayIcon } from 'lucide-react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useSearchParams } from 'react-router-dom'
-import { getCopyFlags, getFilterFlags, getGlobalFlags, startCopy } from '../../lib/rclone'
+import { getCopyFlags, getFilterFlags, getGlobalFlags, startCopy } from '../../lib/rclone/api'
 import { usePersistedStore } from '../../lib/store'
 import { getLoadingTray, getMainTray } from '../../lib/tray'
 import { openTrayWindow } from '../../lib/window'
diff --git a/src/pages/Jobs.tsx b/src/pages/Jobs.tsx
index 0b427e9..c6a8698 100644
--- a/src/pages/Jobs.tsx
+++ b/src/pages/Jobs.tsx
@@ -6,7 +6,7 @@ import { Trash2Icon } from 'lucide-react'
 import { useCallback, useEffect } from 'react'
 import { useState } from 'react'
 import { formatBytes } from '../../lib/format'
-import { listJobs, stopJob } from '../../lib/rclone'
+import { listJobs, stopJob } from '../../lib/rclone/api'
 
 export default function Jobs() {
     const [isInitialLoad, setIsInitialLoad] = useState(true)
diff --git a/src/pages/Mount.tsx b/src/pages/Mount.tsx
index 61ddaab..ab528f7 100644
--- a/src/pages/Mount.tsx
+++ b/src/pages/Mount.tsx
@@ -13,7 +13,7 @@ import {
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useSearchParams } from 'react-router-dom'
 import { isDirectoryEmpty } from '../../lib/fs'
-import { getGlobalFlags, getMountFlags, getVfsFlags, mountRemote } from '../../lib/rclone'
+import { getGlobalFlags, getMountFlags, getVfsFlags, mountRemote } from '../../lib/rclone/api'
 import { usePersistedStore } from '../../lib/store'
 import OptionsSection from '../components/OptionsSection'
 import PathFinder from '../components/PathFinder'
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index 0c7c22f..1499140 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -2,7 +2,7 @@ import { Button, Card, CardBody } from '@nextui-org/react'
 import { confirm } from '@tauri-apps/plugin-dialog'
 import { CableIcon, PencilIcon, Plus, Trash2Icon } from 'lucide-react'
 import { useState } from 'react'
-import { deleteRemote } from '../../lib/rclone'
+import { deleteRemote } from '../../lib/rclone/api'
 import { useStore } from '../../lib/store'
 import { triggerTrayRebuild } from '../../lib/tray'
 import RemoteCreateDrawer from '../components/RemoteCreateDrawer'
diff --git a/src/pages/Sync.tsx b/src/pages/Sync.tsx
index 4f41626..36afb99 100644
--- a/src/pages/Sync.tsx
+++ b/src/pages/Sync.tsx
@@ -4,7 +4,7 @@ import { message } from '@tauri-apps/plugin-dialog'
 import { AlertOctagonIcon, FilterIcon, FolderSyncIcon, FoldersIcon, PlayIcon } from 'lucide-react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
-import { getFilterFlags, getGlobalFlags, getSyncFlags, startSync } from '../../lib/rclone'
+import { getFilterFlags, getGlobalFlags, getSyncFlags, startSync } from '../../lib/rclone/api'
 import { usePersistedStore } from '../../lib/store'
 import OptionsSection from '../components/OptionsSection'
 import PathFinder from '../components/PathFinder'