diff --git a/surfsense_backend/app/connectors/google_drive/__init__.py b/surfsense_backend/app/connectors/google_drive/__init__.py
new file mode 100644
index 000000000..c50135155
--- /dev/null
+++ b/surfsense_backend/app/connectors/google_drive/__init__.py
@@ -0,0 +1,24 @@
+"""
+Google Drive Connector Module.
+
+Simple, modular approach to Google Drive indexing.
+"""
+
+from .change_tracker import categorize_change, fetch_all_changes, get_start_page_token
+from .client import GoogleDriveClient
+from .content_extractor import download_and_process_file
+from .credentials import get_valid_credentials, validate_credentials
+from .folder_manager import get_files_in_folder, list_folder_contents
+
+__all__ = [
+    "GoogleDriveClient",
+    "get_valid_credentials",
+    "validate_credentials",
+    "download_and_process_file",
+    "get_files_in_folder",
+    "list_folder_contents",
+    "get_start_page_token",
+    "fetch_all_changes",
+    "categorize_change",
+]
+
diff --git a/surfsense_backend/app/connectors/google_drive/credentials.py b/surfsense_backend/app/connectors/google_drive/credentials.py
new file mode 100644
index 000000000..5d09df881
--- /dev/null
+++ b/surfsense_backend/app/connectors/google_drive/credentials.py
@@ -0,0 +1,109 @@
+"""
+Google Drive OAuth Credentials Management.
+
+Handles credential validation, token refresh, and persistence to database.
+Small, focused module for credential operations only.
+"""
+
+import json
+from datetime import datetime
+
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.future import select
+from sqlalchemy.orm.attributes import flag_modified
+
+from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+
+async def get_valid_credentials(
+    session: AsyncSession,
+    connector_id: int,
+) -> Credentials:
+    """
+    Get valid Google OAuth credentials, refreshing if needed.
+
+    Args:
+        session: Database session
+        connector_id: Connector ID
+
+    Returns:
+        Valid Google OAuth credentials
+
+    Raises:
+        ValueError: If credentials are missing or invalid
+        Exception: If token refresh fails
+    """
+    # Fetch connector from database
+    result = await session.execute(
+        select(SearchSourceConnector).filter(
+            SearchSourceConnector.id == connector_id
+        )
+    )
+    connector = result.scalars().first()
+
+    if not connector:
+        raise ValueError(f"Connector {connector_id} not found")
+
+    # Extract credentials from config
+    config_data = connector.config
+    exp = config_data.get("expiry", "").replace("Z", "")
+
+    # Validate required fields
+    if not all(
+        [
+            config_data.get("client_id"),
+            config_data.get("client_secret"),
+            config_data.get("refresh_token"),
+        ]
+    ):
+        raise ValueError(
+            "Google OAuth credentials (client_id, client_secret, refresh_token) must be set"
+        )
+
+    # Create credentials object
+    credentials = Credentials(
+        token=config_data.get("token"),
+        refresh_token=config_data.get("refresh_token"),
+        token_uri=config_data.get("token_uri"),
+        client_id=config_data.get("client_id"),
+        client_secret=config_data.get("client_secret"),
+        scopes=config_data.get("scopes", []),
+        expiry=datetime.fromisoformat(exp) if exp else None,
+    )
+
+    # Refresh token if expired
+    if credentials.expired or not credentials.valid:
+        try:
+            credentials.refresh(Request())
+
+            # Persist refreshed token to database
+            connector.config = json.loads(credentials.to_json())
+            flag_modified(connector, "config")
+            await session.commit()
+
+        except Exception as e:
+            raise Exception(f"Failed to refresh Google OAuth credentials: {e!s}") from e
+
+    return credentials
+
+
+def validate_credentials(credentials: Credentials) -> bool:
+    """
+    Validate that credentials have required fields.
+
+    Args:
+        credentials: Google OAuth credentials
+
+    Returns:
+        True if valid, False otherwise
+    """
+    return all(
+        [
+            credentials.client_id,
+            credentials.client_secret,
+            credentials.refresh_token,
+        ]
+    )
+