diff --git a/.changeset/short-eels-join.md b/.changeset/short-eels-join.md
new file mode 100644
index 00000000..d15ee612
--- /dev/null
+++ b/.changeset/short-eels-join.md
@@ -0,0 +1,6 @@
+---
+"@react-native-documents/picker": patch
+"@react-native-documents/viewer": patch
+---
+
+fix: clean up gradle files
diff --git a/example/babel.config.js b/example/babel.config.js
index 3e0218e6..e924cb4c 100644
--- a/example/babel.config.js
+++ b/example/babel.config.js
@@ -1,3 +1,29 @@
+const path = require('path')
+const root = path.resolve(__dirname, '..', 'packages')
+
+const pickerPath = path.join(
+  root,
+  'document-picker',
+  require('../packages/document-picker/package.json').exports['.'].source,
+)
+const viewerPath = path.join(
+  root,
+  'document-viewer',
+  require('../packages/document-viewer/package.json').exports['.'].source,
+)
+
 module.exports = {
   presets: ['module:@react-native/babel-preset'],
+  plugins: [
+    [
+      require.resolve('babel-plugin-module-resolver'),
+      {
+        extensions: ['.tsx', '.ts', '.jsx', '.js', '.json'],
+        alias: {
+          '@react-native-documents/picker': pickerPath,
+          '@react-native-documents/viewer': viewerPath,
+        },
+      },
+    ],
+  ],
 }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 58b07990..2d60891d 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1282,7 +1282,7 @@ PODS:
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
-  - react-native-document-picker (10.1.7):
+  - react-native-document-picker (11.0.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1304,7 +1304,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - react-native-document-viewer (1.0.3):
+  - react-native-document-viewer (2.0.2):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1994,8 +1994,8 @@ SPEC CHECKSUMS:
   React-logger: 7b234de35acb469ce76d6bbb0457f664d6f32f62
   React-Mapbuffer: fbe1da882a187e5898bdf125e1cc6e603d27ecae
   React-microtasksnativemodule: 76905804171d8ccbe69329fc84c57eb7934add7f
-  react-native-document-picker: a3c4ce6322b7aa9902fe8ffb8e03d5858b5d7beb
-  react-native-document-viewer: 6fc76b1f9f2773a39b155f10aae674cf731f21b2
+  react-native-document-picker: 82f4a016ec665949ac859dfed0b38fc5f4121d88
+  react-native-document-viewer: e88dc4e4c5b27b261628dddc07e254dace79ac68
   react-native-segmented-control: bf6e0032726727498e18dd437ae88afcdbc18e99
   React-NativeModulesApple: a9464983ccc0f66f45e93558671f60fc7536e438
   React-oscompat: 73db7dbc80edef36a9d6ed3c6c4e1724ead4236d
diff --git a/example/metro.config.js b/example/metro.config.js
index 63a31ca2..1fd8ac9c 100644
--- a/example/metro.config.js
+++ b/example/metro.config.js
@@ -1,35 +1,8 @@
 const path = require('path')
 
-const exclusionList = require('metro-config/private/defaults/exclusionList')
-
-const blockList = exclusionList([
-  /node_modules\/.*\/node_modules\/react-native\/.*/,
-
-  // This stops "react-native run-windows" from causing the metro server to
-  // crash if its already running
-  new RegExp(`${path.join(__dirname, 'windows').replace(/[/\\]+/g, '/')}.*`),
-
-  // Workaround for `EPERM: operation not permitted, lstat '~\midl-MIDLRT-cl.read.1.tlog'`
-  /.*\.tlog/,
-
-  // Prevent Metro from watching temporary files generated by Visual Studio
-  // otherwise it may crash when they are removed when closing a project.
-  /.*\/.vs\/.*/,
-
-  // Workaround for `EBUSY: resource busy or locked, open '~\msbuild.ProjectImports.zip'`
-  /.*\.ProjectImports\.zip/,
-])
-
 const config = {
   projectRoot: __dirname,
   watchFolders: [path.join(__dirname, '../..')],
-  resolver: {
-    blockList,
-    extraNodeModules: {
-      '@react-native-documents/picker': path.resolve(__dirname, '../../packages/document-picker'),
-      '@react-native-documents/viewer': path.resolve(__dirname, '../../packages/document-viewer'),
-    },
-  },
 }
 
 // Starting with react-native 0.72, we are required to provide a full config.
diff --git a/example/package.json b/example/package.json
index f39d116c..c1c6d711 100644
--- a/example/package.json
+++ b/example/package.json
@@ -40,6 +40,7 @@
     "@wdio/spec-reporter": "^8.36.1",
     "appium": "^2.5.4",
     "appium-uiautomator2-driver": "^3.1.0",
+    "babel-plugin-module-resolver": "^5.0.2",
     "pod-install": "1.0.7",
     "react-native-test-app": "^4.4.12",
     "ts-node": "^10.9.2",
diff --git a/packages/document-picker/android/build.gradle b/packages/document-picker/android/build.gradle
index 536f07e1..afa4f7a8 100644
--- a/packages/document-picker/android/build.gradle
+++ b/packages/document-picker/android/build.gradle
@@ -34,10 +34,7 @@ if (isNewArchitectureEnabled()) {
 
 
 android {
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-      namespace "com.reactnativedocumentpicker"
-    }
+    namespace "com.reactnativedocumentpicker"
     compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -70,11 +67,8 @@ repositories {
     mavenCentral()
 }
 
-def kotlin_version = getExtOrIntegerDefault("kotlinVersion")
-
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+' // from node_modules
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
 }
diff --git a/packages/document-picker/android/gradle.properties b/packages/document-picker/android/gradle.properties
new file mode 100644
index 00000000..4733bdcd
--- /dev/null
+++ b/packages/document-picker/android/gradle.properties
@@ -0,0 +1 @@
+DocumentPicker_kotlinVersion=2.0.21
diff --git a/packages/document-picker/android/src/main/AndroidManifest.xml b/packages/document-picker/android/src/main/AndroidManifest.xml
index eb117542..c4e6c98d 100644
--- a/packages/document-picker/android/src/main/AndroidManifest.xml
+++ b/packages/document-picker/android/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativedocumentpicker">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/packages/document-viewer/android/build.gradle b/packages/document-viewer/android/build.gradle
index 1d38d78a..1d041c89 100644
--- a/packages/document-viewer/android/build.gradle
+++ b/packages/document-viewer/android/build.gradle
@@ -34,10 +34,7 @@ if (isNewArchitectureEnabled()) {
 
 
 android {
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-      namespace "com.reactnativedocumentviewer"
-    }
+    namespace "com.reactnativedocumentviewer"
     compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -70,10 +67,7 @@ repositories {
     mavenCentral()
 }
 
-def kotlin_version = getExtOrIntegerDefault("kotlinVersion")
-
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+' // from node_modules
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/packages/document-viewer/android/gradle.properties b/packages/document-viewer/android/gradle.properties
new file mode 100644
index 00000000..4733bdcd
--- /dev/null
+++ b/packages/document-viewer/android/gradle.properties
@@ -0,0 +1 @@
+DocumentPicker_kotlinVersion=2.0.21
diff --git a/packages/document-viewer/android/src/main/AndroidManifest.xml b/packages/document-viewer/android/src/main/AndroidManifest.xml
index c6d73a01..98c6c2cb 100644
--- a/packages/document-viewer/android/src/main/AndroidManifest.xml
+++ b/packages/document-viewer/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativedocumentviewer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
   <application>
diff --git a/yarn.lock b/yarn.lock
index 80d2af57..19a17c7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5439,6 +5439,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-module-resolver@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "babel-plugin-module-resolver@npm:5.0.2"
+  dependencies:
+    find-babel-config: "npm:^2.1.1"
+    glob: "npm:^9.3.3"
+    pkg-up: "npm:^3.1.0"
+    reselect: "npm:^4.1.7"
+    resolve: "npm:^1.22.8"
+  checksum: 10c0/ccbb9e673c4219f68937349267521becb72be292cf30bf70b861c3e709d24fbfa589da0bf6c100a0def799d38199299171cb6eac3fb00b1ea740373e2c1fe54c
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-corejs2@npm:^0.4.10":
   version: 0.4.12
   resolution: "babel-plugin-polyfill-corejs2@npm:0.4.12"
@@ -8081,6 +8094,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-babel-config@npm:^2.1.1":
+  version: 2.1.2
+  resolution: "find-babel-config@npm:2.1.2"
+  dependencies:
+    json5: "npm:^2.2.3"
+  checksum: 10c0/c9151b23d636378eae11aa761b0af41d5f67d5479e3ebfca7b0ec7feef91723f14242d243342783b89e6c51fc5b4120086eacf5d8a1a335cf7bae4b0ac89f493
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "find-up@npm:3.0.0"
+  dependencies:
+    locate-path: "npm:^3.0.0"
+  checksum: 10c0/2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
+  languageName: node
+  linkType: hard
+
 "find-up@npm:^4.0.0, find-up@npm:^4.1.0":
   version: 4.1.0
   resolution: "find-up@npm:4.1.0"
@@ -8572,6 +8603,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^9.3.3":
+  version: 9.3.5
+  resolution: "glob@npm:9.3.5"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    minimatch: "npm:^8.0.2"
+    minipass: "npm:^4.2.4"
+    path-scurry: "npm:^1.6.1"
+  checksum: 10c0/2f6c2b9ee019ee21dc258ae97a88719614591e4c979cb4580b1b9df6f0f778a3cb38b4bdaf18dfa584637ea10f89a3c5f2533a5e449cf8741514ad18b0951f2e
+  languageName: node
+  linkType: hard
+
 "glob@npm:~7.1.1":
   version: 7.1.7
   resolution: "glob@npm:7.1.7"
@@ -9255,7 +9298,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.5.0":
+"is-core-module@npm:^2.16.1, is-core-module@npm:^2.5.0":
   version: 2.16.1
   resolution: "is-core-module@npm:2.16.1"
   dependencies:
@@ -10601,6 +10644,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"locate-path@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "locate-path@npm:3.0.0"
+  dependencies:
+    p-locate: "npm:^3.0.0"
+    path-exists: "npm:^3.0.0"
+  checksum: 10c0/3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^5.0.0":
   version: 5.0.0
   resolution: "locate-path@npm:5.0.0"
@@ -11392,6 +11445,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^8.0.2":
+  version: 8.0.4
+  resolution: "minimatch@npm:8.0.4"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/a0a394c356dd5b4cb7f821720841a82fa6f07c9c562c5b716909d1b6ec5e56a7e4c4b5029da26dd256b7d2b3a3f38cbf9ddd8680e887b9b5282b09c05501c1ca
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^9.0.0, minimatch@npm:^9.0.4":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
@@ -11488,6 +11550,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass@npm:^4.2.4":
+  version: 4.2.8
+  resolution: "minipass@npm:4.2.8"
+  checksum: 10c0/4ea76b030d97079f4429d6e8a8affd90baf1b6a1898977c8ccce4701c5a2ba2792e033abc6709373f25c2c4d4d95440d9d5e9464b46b7b76ca44d2ce26d939ce
+  languageName: node
+  linkType: hard
+
 "minipass@npm:^5.0.0":
   version: 5.0.0
   resolution: "minipass@npm:5.0.0"
@@ -12073,7 +12142,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^2.2.0":
+"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
   dependencies:
@@ -12109,6 +12178,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-locate@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "p-locate@npm:3.0.0"
+  dependencies:
+    p-limit: "npm:^2.0.0"
+  checksum: 10c0/7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^4.1.0":
   version: 4.1.0
   resolution: "p-locate@npm:4.1.0"
@@ -12303,6 +12381,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-exists@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "path-exists@npm:3.0.0"
+  checksum: 10c0/17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
@@ -12345,7 +12430,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.11.1":
+"path-scurry@npm:^1.11.1, path-scurry@npm:^1.6.1":
   version: 1.11.1
   resolution: "path-scurry@npm:1.11.1"
   dependencies:
@@ -12452,6 +12537,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-up@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "pkg-up@npm:3.1.0"
+  dependencies:
+    find-up: "npm:^3.0.0"
+  checksum: 10c0/ecb60e1f8e1f611c0bdf1a0b6a474d6dfb51185567dc6f29cdef37c8d480ecba5362e006606bb290519bbb6f49526c403fabea93c3090c20368d98bb90c999ab
+  languageName: node
+  linkType: hard
+
 "plist@npm:3.1.0":
   version: 3.1.0
   resolution: "plist@npm:3.1.0"
@@ -12867,6 +12961,7 @@ __metadata:
     "@wdio/spec-reporter": "npm:^8.36.1"
     appium: "npm:^2.5.4"
     appium-uiautomator2-driver: "npm:^3.1.0"
+    babel-plugin-module-resolver: "npm:^5.0.2"
     invariant: "npm:^2.2.4"
     pod-install: "npm:1.0.7"
     react: "npm:19.1.0"
@@ -13291,6 +13386,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reselect@npm:^4.1.7":
+  version: 4.1.8
+  resolution: "reselect@npm:4.1.8"
+  checksum: 10c0/06a305a504affcbb67dd0561ddc8306b35796199c7e15b38934c80606938a021eadcf68cfd58e7bb5e17786601c37602a3362a4665c7bf0a96c1041ceee9d0b7
+  languageName: node
+  linkType: hard
+
 "resolve-alpn@npm:^1.2.0":
   version: 1.2.1
   resolution: "resolve-alpn@npm:1.2.1"
@@ -13357,6 +13459,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@npm:^1.22.8":
+  version: 1.22.11
+  resolution: "resolve@npm:1.22.11"
+  dependencies:
+    is-core-module: "npm:^2.16.1"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
+  bin:
+    resolve: bin/resolve
+  checksum: 10c0/f657191507530f2cbecb5815b1ee99b20741ea6ee02a59c57028e9ec4c2c8d7681afcc35febbd554ac0ded459db6f2d8153382c53a2f266cee2575e512674409
+  languageName: node
+  linkType: hard
+
 "resolve@npm:^2.0.0-next.5":
   version: 2.0.0-next.5
   resolution: "resolve@npm:2.0.0-next.5"
@@ -13383,6 +13498,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
+  version: 1.22.11
+  resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
+  dependencies:
+    is-core-module: "npm:^2.16.1"
+    path-parse: "npm:^1.0.7"
+    supports-preserve-symlinks-flag: "npm:^1.0.0"
+  bin:
+    resolve: bin/resolve
+  checksum: 10c0/ee5b182f2e37cb1165465e58c6abc797fec0a80b5ba3231607beb4677db0c9291ac010c47cf092b6daa2b7f518d69a0e21888e7e2b633f68d501a874212a8c63
+  languageName: node
+  linkType: hard
+
 "resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
   version: 2.0.0-next.5
   resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"