diff --git a/.cursor/rules/README.md b/.cursor/rules/README.md
index 174ccf1c..f5c1f870 100644
--- a/.cursor/rules/README.md
+++ b/.cursor/rules/README.md
@@ -1,23 +1,5 @@
-# Cursor Rules – Contentstack Java CDA SDK
+# Cursor (optional)
 
-This directory contains Cursor AI rules that apply when working in this repository. Rules provide persistent context so the AI follows project conventions and Contentstack CDA patterns.
+**Cursor** users: start at **[AGENTS.md](../../AGENTS.md)**. All conventions live in **`skills/*/SKILL.md`**.
 
-## How rules are applied
-
-- **File-specific rules** use the `globs` frontmatter: they apply when you open or edit files matching that pattern.
-- **Always-on rules** use `alwaysApply: true`: they are included in every conversation in this project.
-
-## Rule index
-
-| File | Applies when | Purpose |
-|------|--------------|---------|
-| **dev-workflow.md** | (Reference only; no glob) | Core development workflow: branches, running tests, PR expectations. Read for process guidance. |
-| **java.mdc** | Editing any `**/*.java` file | Java 8 standards: naming, package layout, `com.contentstack.sdk` structure, logging, Lombok/annotations, avoiding raw types. |
-| **contentstack-java-cda.mdc** | Editing `src/main/java/com/contentstack/sdk/**/*.java` | CDA-specific patterns: Stack/Config, host/version/region/branch, RetryOptions/RetryInterceptor, callbacks, alignment with Content Delivery API. |
-| **testing.mdc** | Editing `src/test/**/*.java` | Testing patterns: JUnit 5, unit vs integration naming (`Test*` vs `*IT`), BaseIntegrationTest, timeouts, JaCoCo. |
-| **code-review.mdc** | Always | PR/review checklist: API stability, error handling, backward compatibility, dependencies and security (e.g. SCA). |
-
-## Related
-
-- **AGENTS.md** (repo root) – Main entry point for AI agents: project overview, entry points, and pointers to rules and skills.
-- **skills/** – Reusable skill docs (Contentstack Java CDA, testing, code review, framework) for deeper guidance on specific tasks.
+This folder only points contributors to **`AGENTS.md`** so editor-specific config does not duplicate the canonical docs.
diff --git a/.cursor/rules/code-review.mdc b/.cursor/rules/code-review.mdc
deleted file mode 100644
index 1e3a9566..00000000
--- a/.cursor/rules/code-review.mdc
+++ /dev/null
@@ -1,36 +0,0 @@
----
-description: PR and code review checklist – API stability, errors, compatibility, security
-alwaysApply: true
----
-
-# Code Review Checklist – Contentstack Java CDA SDK
-
-Use this checklist when reviewing pull requests or before opening a PR.
-
-## API design and stability
-
-- [ ] **Public API:** New or changed public methods/classes are necessary and clearly documented (Javadoc).
-- [ ] **Backward compatibility:** No breaking changes to public API unless explicitly called out and justified (e.g. major version).
-- [ ] **Naming:** Method and class names are consistent with existing SDK style and CDA terminology.
-
-## Error handling and robustness
-
-- [ ] **Errors:** API failures are mapped to the SDK **`Error`** type and passed through existing callback/result patterns.
-- [ ] **Null safety:** No unintended NPEs; parameters and return values are documented or annotated where it matters (e.g. `@NotNull`/`@Nullable`).
-- [ ] **Exceptions:** Checked exceptions are handled or declared; unchecked exceptions are used only where appropriate and documented.
-
-## Dependencies and security
-
-- [ ] **Dependencies:** No new dependencies without justification; version bumps are intentional and do not introduce known vulnerabilities.
-- [ ] **SCA:** Address any security findings (e.g. from Snyk or similar) in the scope of the PR or in a follow-up.
-
-## Testing
-
-- [ ] **Coverage:** New or modified behavior is covered by unit and/or integration tests as appropriate.
-- [ ] **Test quality:** Tests are readable, stable (no flakiness), and follow project conventions (`Test*` / `*IT`, `BaseIntegrationTest` for integration tests).
-
-## Severity (optional)
-
-- **Blocker:** Must fix before merge (e.g. breaking public API without approval, security issue, no tests for new code).
-- **Major:** Should fix (e.g. inconsistent error handling, missing Javadoc on new public API).
-- **Minor:** Nice to fix (e.g. style, minor docs).
diff --git a/.cursor/rules/contentstack-java-cda.mdc b/.cursor/rules/contentstack-java-cda.mdc
deleted file mode 100644
index 3226ed59..00000000
--- a/.cursor/rules/contentstack-java-cda.mdc
+++ /dev/null
@@ -1,35 +0,0 @@
----
-description: Contentstack CDA patterns – Stack/Config, HTTP, retry, callbacks, Content Delivery API
-globs: "src/main/java/com/contentstack/sdk/**/*.java"
----
-
-# Contentstack Java CDA – SDK Rules
-
-Apply when editing the SDK core (`com.contentstack.sdk`). Keep behavior aligned with the [Content Delivery API](https://www.contentstack.com/docs/apis/content-delivery-api/).
-
-## Stack and Config
-
-- **Entry point:** `Contentstack.stack(apiKey, deliveryToken, environment)` returns a `Stack`. Use `Config` for optional settings.
-- **Default host:** `cdn.contentstack.io`; **API version:** `v3` (see `Config`).
-- **Config options:** host, version, scheme, region (`ContentstackRegion`), branch, live preview, proxy, connection pool, **RetryOptions**, early access, plugins. Set these via `Config` before building the stack.
-- **Region/branch:** Support `Config.setRegion()` and `Config.setBranch()` for regional and branch-specific delivery.
-
-## HTTP layer
-
-- **Requests** go through **`CSHttpConnection`** and **`APIService`** (Retrofit). Do not bypass this for CDA calls.
-- **Headers:** Use the same headers and User-Agent as the rest of the SDK (see `Constants` and request setup in `CSHttpConnection`).
-- **Errors:** Map API errors to the SDK **`Error`** class (errorMessage, errorCode, errDetails) and pass to **`ResultCallBack`** or equivalent callback.
-
-## Retry and resilience
-
-- **RetryOptions:** Configurable retry limit, delay, backoff strategy (e.g. exponential), and retryable status codes (e.g. 408, 429, 502, 503, 504). Defaults are in `RetryOptions`.
-- **RetryInterceptor:** Uses `RetryOptions` to retry failed HTTP requests. Keep retry behavior consistent when changing the HTTP client or interceptors.
-
-## Callbacks and async
-
-- Use existing callback types (e.g. **`ResultCallBack`**, **`EntryResultCallBack`**, **`QueryResultsCallBack`**) for async results. Do not introduce incompatible callback signatures without considering backward compatibility.
-- Pass **`Error`** and response data through the same callback patterns used elsewhere in the SDK.
-
-## CDA concepts
-
-- **Entry,** **Query,** **Asset,** **Content Type,** **Sync,** **Taxonomy** – follow existing class and method names and the CDA API semantics (e.g. query params, response parsing). When adding new CDA features, align with the official Content Delivery API documentation.
diff --git a/.cursor/rules/dev-workflow.md b/.cursor/rules/dev-workflow.md
deleted file mode 100644
index b6e724b5..00000000
--- a/.cursor/rules/dev-workflow.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Development Workflow – Contentstack Java CDA SDK
-
-Use this as the standard workflow when contributing to the Java CDA SDK.
-
-## Branches
-
-- Use feature branches for changes (e.g. `feat/...`, `fix/...`).
-- Base work off the appropriate long-lived branch (e.g. `staging`, `development`) per team norms.
-
-## Running tests
-
-- **All tests:** `mvn test`
-- **Specific test class:** `mvn test -Dtest=TestEntry`
-- **Integration tests only:** `mvn test -Dtest='*IT'`
-- **Unit tests only:** `mvn test -Dtest='Test*'`
-
-Run tests before opening a PR. Integration tests may require a valid `.env` with stack credentials (see `Credentials` and `BaseIntegrationTest` in the test suite).
-
-## Pull requests
-
-- Ensure the build passes: `mvn clean test`
-- Follow the **code-review** rule (see `.cursor/rules/code-review.mdc`) for the PR checklist.
-- Keep changes backward-compatible for public API; call out any breaking changes clearly.
-
-## Optional: TDD
-
-If the team uses TDD, follow RED–GREEN–REFACTOR when adding behavior: write a failing test first, then implement to pass, then refactor. The **testing** rule and **skills/testing** skill describe test structure and naming.
diff --git a/.cursor/rules/java.mdc b/.cursor/rules/java.mdc
deleted file mode 100644
index c6b9b803..00000000
--- a/.cursor/rules/java.mdc
+++ /dev/null
@@ -1,41 +0,0 @@
----
-description: Java 8 standards and com.contentstack.sdk conventions for the CDA SDK
-globs: "**/*.java"
----
-
-# Java Standards – Contentstack Java CDA SDK
-
-Apply these conventions when editing Java code in this repository.
-
-## Language and runtime
-
-- **Java 8** (source/target 1.8). Do not use language or API features that require a higher version.
-- Avoid raw types; use proper generics where applicable.
-
-## Package and layout
-
-- All SDK code lives under **`com.contentstack.sdk`** (see `src/main/java/com/contentstack/sdk/`).
-- Keep the existing package structure; do not introduce new top-level packages without alignment with the rest of the SDK.
-
-## Naming
-
-- **Classes:** PascalCase (e.g. `CSHttpConnection`, `RetryOptions`).
-- **Methods/variables:** camelCase.
-- **Constants:** UPPER_SNAKE_CASE (e.g. in `Constants.java`).
-- **Test classes:** `Test*` for unit tests, `*IT` for integration tests (see **testing.mdc** for test rules).
-
-## Logging
-
-- Use **`java.util.logging`** (Logger) as in `CSHttpConnection` and other SDK classes.
-- Obtain loggers with `Logger.getLogger(ClassName.class.getName())`.
-- Log at appropriate levels (e.g. `warning` for recoverable issues, `fine`/`finer` for debug).
-
-## Annotations and Lombok
-
-- Use **Lombok** where the project already does (e.g. getters/setters, builders) for consistency.
-- Use **`@NotNull`** / **`@Nullable`** (e.g. JetBrains annotations) where they are already used to document nullability.
-
-## General
-
-- Prefer immutability where practical (e.g. final fields, defensive copies for collections).
-- Document public API with Javadoc; keep examples in Javadoc in sync with actual usage (e.g. `Contentstack.stack(...)`, `Config`).
diff --git a/.cursor/rules/testing.mdc b/.cursor/rules/testing.mdc
deleted file mode 100644
index c9d6f19f..00000000
--- a/.cursor/rules/testing.mdc
+++ /dev/null
@@ -1,35 +0,0 @@
----
-description: JUnit 5 testing patterns, unit vs integration, BaseIntegrationTest, JaCoCo
-globs: "src/test/**/*.java"
----
-
-# Testing Rules – Contentstack Java CDA SDK
-
-Apply when writing or editing tests. The project uses **JUnit 5** and **JaCoCo** (see `pom.xml`).
-
-## Test naming and layout
-
-- **Unit tests:** Class name prefix **`Test`** (e.g. `TestEntry`, `TestConfig`). Place in `src/test/java/com/contentstack/sdk/`.
-- **Integration tests:** Class name suffix **`IT`** (e.g. `ContentstackIT`, `SyncStackIT`). Same package. Use **`BaseIntegrationTest`** for shared setup and timeouts.
-
-## JUnit 5 usage
-
-- Use **JUnit 5** (Jupiter) APIs: `@Test`, `@BeforeAll`, `@AfterAll`, `@BeforeEach`, `@AfterEach`, `@DisplayName`, etc.
-- Prefer **`TestInstance(Lifecycle.PER_CLASS)`** when sharing a single instance across tests (e.g. `BaseIntegrationTest`).
-- Use **assertions** from `org.junit.jupiter.api.Assertions`.
-
-## Integration test base and timeouts
-
-- Extend **`BaseIntegrationTest`** for integration tests that need a real stack. It provides:
-  - `stack` from **`Credentials.getStack()`** (`.env`-based).
-  - Timeout constants: `DEFAULT_TIMEOUT_SECONDS`, `PERFORMANCE_TIMEOUT_SECONDS`, `LARGE_DATASET_TIMEOUT_SECONDS`.
-- Use **`Assertions.assertTimeout(Duration.ofSeconds(...), () -> { ... })`** (or equivalent) for async or long-running operations so tests don’t hang.
-
-## Test data and credentials
-
-- **Credentials:** Use **`Credentials`** and a `.env` file for integration tests (API key, delivery token, environment). Do not commit real tokens; document required env vars (e.g. in README or test docs).
-- **Fixtures:** Use existing test assets (e.g. under `src/test/` or `target/test-classes/`) where applicable.
-
-## Coverage
-
-- **JaCoCo** is configured in `pom.xml`. Reports are generated on `mvn test` (e.g. `target/site/jacoco/`). Maintain or improve coverage when adding or changing production code; avoid removing tests that cover critical paths without replacement.
diff --git a/AGENTS.md b/AGENTS.md
index 3184527b..86b23f65 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,50 +1,43 @@
-# Contentstack Java CDA SDK – Agent Guide
+# Contentstack Java Delivery SDK – Agent guide
 
-This document is the main entry point for AI agents working in this repository.
+**Universal entry point** for contributors and AI agents. Detailed conventions live in **`skills/*/SKILL.md`**.
 
-## Project
+## What this repo is
 
-- **Name:** Contentstack Java CDA SDK (contentstack-java)
-- **Purpose:** Java client for the Contentstack **Content Delivery API (CDA)**. It fetches content (entries, assets, content types, sync, taxonomy) from Contentstack and delivers it to Java applications.
-- **Repo:** [contentstack-java](https://github.com/contentstack/contentstack-java)
+| Field | Detail |
+|--------|--------|
+| **Name:** | [contentstack-java](https://github.com/contentstack/contentstack-java) (`com.contentstack.sdk:java`) |
+| **Purpose:** | Java SDK for the Contentstack Content Delivery API (stack, entries, assets, queries, sync, etc.). |
+| **Out of scope:** | Not the Android or Swift SDKs—use those repositories for mobile-specific clients. |
 
-## Tech stack
+## Tech stack (at a glance)
 
-- **Language:** Java 8 (source/target 1.8)
-- **Build:** Maven
-- **Testing:** JUnit 5, JaCoCo (coverage)
-- **HTTP:** Retrofit 2, OkHttp
-- **Other:** Gson, RxJava 3, Lombok, contentstack-utils
+| Area | Details |
+|------|---------|
+| Language | Java **8** (`maven.compiler.source/target` in `pom.xml`) |
+| Build | Maven (`pom.xml`); JaCoCo for coverage |
+| Tests | JUnit 5; unit tests and `*IT` integration tests under `src/test/java/` |
+| Lint / coverage | JaCoCo (`jacoco:report` in CI); no separate Checkstyle in quick path—follow existing style |
+| CI | `.github/workflows/unit-testing.yml`, `check-branch.yml`, `sca-scan.yml`, `policy-scan.yml`, `codeql-analysis.yml`, publish workflows |
 
-## Main entry points
+## Commands (quick reference)
 
-- **`Contentstack`** – Static factory: `Contentstack.stack(apiKey, deliveryToken, environment)` returns a `Stack`.
-- **`Stack`** – Main API surface: entries, assets, content types, sync, live preview, etc.
-- **`Config`** – Optional configuration: host, version, region, branch, retry, proxy, connection pool, plugins.
-- **Paths:** `src/main/java/com/contentstack/sdk/` (production), `src/test/java/com/contentstack/sdk/` (tests).
+| Command type | Command |
+|--------------|---------|
+| Build / test | `mvn clean test -Dgpg.skip=true` (adjust `-Dtest` per `pom.xml` surefire notes) |
+| Coverage (CI-style) | `mvn clean test -Dtest='Test*' jacoco:report -Dgpg.skip=true` |
 
-## Commands
+## Where the documentation lives: skills
 
-- **Build and test:** `mvn clean test`
-- **Single test class:** `mvn test -Dtest=TestEntry`
-- **Integration tests only:** `mvn test -Dtest='*IT'`
-- **Unit tests only:** `mvn test -Dtest='Test*'`
+| Skill | Path | What it covers |
+|-------|------|----------------|
+| **Development workflow** | [`skills/dev-workflow/SKILL.md`](skills/dev-workflow/SKILL.md) | Branches, Maven, CI, JaCoCo |
+| **Java CDA SDK** | [`skills/contentstack-java-cda/SKILL.md`](skills/contentstack-java-cda/SKILL.md) | Public API: `Stack`, queries, callbacks, HTTP layer |
+| **Java style & layout** | [`skills/java/SKILL.md`](skills/java/SKILL.md) | `src/main/java` packages, Lombok, Retrofit/Rx usage |
+| **Framework / HTTP** | [`skills/framework/SKILL.md`](skills/framework/SKILL.md) | Config, RetryOptions, CSHttpConnection, OkHttp/Retrofit flow |
+| **Testing** | [`skills/testing/SKILL.md`](skills/testing/SKILL.md) | Unit vs integration tests, resources, credentials |
+| **Code review** | [`skills/code-review/SKILL.md`](skills/code-review/SKILL.md) | PR checklist for JVM SDK |
 
-Integration tests may require a `.env` with stack credentials (see `Credentials` and test README/docs).
+## Using Cursor (optional)
 
-## Rules and skills
-
-- **`.cursor/rules/`** – Cursor rules for this repo:
-  - **README.md** – Index of all rules.
-  - **dev-workflow.md** – Development workflow (branches, tests, PRs).
-  - **java.mdc** – Applies to `**/*.java`: Java 8 and SDK conventions.
-  - **contentstack-java-cda.mdc** – Applies to SDK core: CDA patterns, Config, HTTP, retry, callbacks.
-  - **testing.mdc** – Applies to `src/test/**/*.java`: JUnit 5, Test* / *IT, BaseIntegrationTest, JaCoCo.
-  - **code-review.mdc** – Always applied: PR/review checklist.
-- **`skills/`** – Reusable skill docs:
-  - Use **contentstack-java-cda** when implementing or changing CDA API usage or SDK core behavior.
-  - Use **testing** when adding or refactoring tests.
-  - Use **code-review** when reviewing PRs or before opening one.
-  - Use **framework** when changing config, retry, or HTTP layer (Config, RetryOptions, RetryInterceptor, CSHttpConnection).
-
-Refer to `.cursor/rules/README.md` for when each rule applies and to `skills/README.md` for skill details.
+If you use **Cursor**, [`.cursor/rules/README.md`](.cursor/rules/README.md) only points to **`AGENTS.md`**—same docs as everyone else.
diff --git a/pom.xml b/pom.xml
index 238f3d8d..2867a070 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.21.1</version>
+            <version>2.21.2</version>
         </dependency>
         <dependency>
             <groupId>com.slack.api</groupId>
diff --git a/skills/README.md b/skills/README.md
deleted file mode 100644
index f4fcc970..00000000
--- a/skills/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Skills – Contentstack Java CDA SDK
-
-This directory contains **skills**: reusable guidance for AI agents (and developers) on specific tasks. Each skill is a folder with a `SKILL.md` file.
-
-## When to use which skill
-
-| Skill | Use when |
-|-------|----------|
-| **contentstack-java-cda** | Implementing or changing CDA features: Stack/Config, entries, assets, content types, sync, taxonomy, HTTP layer, retry, callbacks, error handling. |
-| **testing** | Writing or refactoring tests: JUnit 5, unit vs integration layout, BaseIntegrationTest, timeouts, Credentials/.env, JaCoCo. |
-| **code-review** | Reviewing a PR or preparing your own: API design, null-safety, exceptions, backward compatibility, dependencies/security, test coverage. |
-| **framework** | Touching config, retry, or the HTTP layer: Config options, RetryOptions/RetryInterceptor, CSHttpConnection, connection/request flow, error handling. |
-
-## How agents should use skills
-
-- **contentstack-java-cda:** Apply when editing SDK core (`com.contentstack.sdk`) or adding CDA-related behavior. Follow Stack/Config, CDA API alignment, and existing callback/error patterns.
-- **testing:** Apply when creating or modifying test classes. Follow naming (`Test*` / `*IT`), BaseIntegrationTest for integration tests, and existing Surefire/JaCoCo setup.
-- **code-review:** Apply when performing or simulating a PR review. Go through the checklist (API stability, errors, compatibility, dependencies, tests) and optional severity levels.
-- **framework:** Apply when changing Config, RetryOptions, RetryInterceptor, or CSHttpConnection. Keep retry and connection behavior consistent with the rest of the SDK.
-
-Each skill’s `SKILL.md` contains more detailed instructions and references.
diff --git a/skills/code-review/SKILL.md b/skills/code-review/SKILL.md
index a084cdb6..921a8d44 100644
--- a/skills/code-review/SKILL.md
+++ b/skills/code-review/SKILL.md
@@ -1,60 +1,27 @@
 ---
 name: code-review
-description: Use when reviewing PRs or before opening a PR – API design, null-safety, exceptions, backward compatibility, dependencies, security, and test quality
+description: Use when reviewing PRs for contentstack-java—API compatibility, tests, Maven, and security.
 ---
 
-# Code Review – Contentstack Java CDA SDK
-
-Use this skill when performing or preparing a pull request review for the Java CDA SDK.
+# Code review – contentstack-java
 
 ## When to use
 
-- Reviewing someone else’s PR.
-- Self-reviewing your own PR before submission.
-- Checking that changes meet project standards (API, errors, compatibility, tests, security).
+- Authoring or reviewing SDK changes
+- Evaluating dependency or Retrofit/HTTP changes
 
 ## Instructions
 
-Work through the checklist below. Optionally tag items with severity: **Blocker**, **Major**, **Minor**.
-
-### 1. API design and stability
-
-- [ ] **Public API:** New or changed public methods/classes are necessary and documented (Javadoc with purpose and, where relevant, params/returns).
-- [ ] **Backward compatibility:** No breaking changes to public API unless explicitly agreed (e.g. major version). Deprecations should have alternatives and timeline.
-- [ ] **Naming:** Consistent with existing SDK style and CDA terminology (e.g. `Stack`, `Entry`, `Query`, `Config`).
-
-**Severity:** Breaking public API without approval = Blocker. Missing docs on new public API = Major.
-
-### 2. Error handling and robustness
-
-- [ ] **Errors:** API failures are mapped to the SDK `Error` type and passed through existing callback/result patterns (e.g. `ResultCallBack`).
-- [ ] **Null safety:** No unintended NPEs; document or annotate (e.g. `@NotNull`/`@Nullable`) where it matters for public API.
-- [ ] **Exceptions:** Checked exceptions are handled or declared; use of unchecked exceptions is intentional and documented where relevant.
-
-**Severity:** Wrong or missing error handling in new code = Major.
-
-### 3. Dependencies and security
-
-- [ ] **Dependencies:** New or upgraded dependencies are justified. Version bumps are intentional and do not introduce known vulnerabilities.
-- [ ] **SCA:** Any security findings (e.g. Snyk, Dependabot) in the change set are addressed or explicitly deferred with a ticket.
-
-**Severity:** New critical/high vulnerability = Blocker.
-
-### 4. Testing
-
-- [ ] **Coverage:** New or modified behavior has corresponding unit and/or integration tests.
-- [ ] **Conventions:** Tests follow naming (`Test*` unit, `*IT` integration) and use `BaseIntegrationTest` for integration tests where appropriate.
-- [ ] **Quality:** Tests are readable, deterministic (no flakiness), and assert meaningful behavior.
-
-**Severity:** No tests for new behavior = Blocker. Flaky or weak tests = Major.
-
-### 5. Optional severity summary
+### Checklist
 
-- **Blocker:** Must fix before merge (e.g. breaking API without approval, security issue, no tests for new code).
-- **Major:** Should fix (e.g. inconsistent error handling, missing Javadoc on new public API, flaky tests).
-- **Minor:** Nice to fix (e.g. style, minor docs, redundant code).
+- **API**: Public methods and models backward compatible or versioned correctly.
+- **Tests**: Unit tests for logic; IT updates if API contracts shift.
+- **Build**: `mvn clean test -Dgpg.skip=true` passes; JaCoCo expectations met when coverage workflow applies.
+- **Dependencies**: Maven coordinates vetted; no unnecessary surface for consumers.
+- **Secrets**: No credentials in source or test resources committed by mistake.
 
-## References
+### Severity hints
 
-- Project rule: `.cursor/rules/code-review.mdc`
-- Testing skill: `skills/testing/SKILL.md` for test standards
+- **Blocker**: Broken build, failing critical tests, or credential leak.
+- **Major**: Missing tests for new public API or risky HTTP changes.
+- **Minor**: Javadoc, naming, internal cleanup.
diff --git a/skills/contentstack-java-cda/SKILL.md b/skills/contentstack-java-cda/SKILL.md
index f7604a0a..9c291970 100644
--- a/skills/contentstack-java-cda/SKILL.md
+++ b/skills/contentstack-java-cda/SKILL.md
@@ -1,54 +1,25 @@
 ---
 name: contentstack-java-cda
-description: Use when implementing or changing CDA features – Stack/Config, entries, assets, sync, taxonomy, HTTP, retry, callbacks, and Content Delivery API alignment
+description: Use for the Java Content Delivery API—Stack, Entry, Query, sync, and HTTP/callback patterns.
 ---
 
-# Contentstack Java CDA SDK – CDA Implementation
-
-Use this skill when implementing or changing Content Delivery API (CDA) behavior in the Java SDK.
+# Java CDA SDK – contentstack-java
 
 ## When to use
 
-- Adding or modifying Stack, Entry, Query, Asset, Content Type, Sync, or Taxonomy behavior.
-- Changing Config options (host, version, region, branch, retry).
-- Working with the HTTP layer (CSHttpConnection, APIService), retry (RetryOptions, RetryInterceptor), or callbacks and Error handling.
+- Changing public classes under `com.contentstack.sdk`
+- Working with Retrofit-backed calls, RxJava flows, or Gson models
 
 ## Instructions
 
-### Stack and Config
-
-- **Entry point:** `Contentstack.stack(apiKey, deliveryToken, environment)`. Optional: pass a `Config` for host, version, region, branch, live preview, retry, proxy, connection pool, early access, plugins.
-- **Defaults:** host `cdn.contentstack.io`, version `v3` (see `Config`). Regional endpoints and branch are supported via `Config.setRegion()` and `Config.setBranch()`.
-- **Reference:** `Contentstack.java`, `Stack.java`, `Config.java`.
-
-### CDA resources
-
-- **Entries:** `Stack.contentType(uid).entry(uid)`, query APIs, and entry fetch. Use existing `Entry`, `Query`, `EntriesModel`, and callback types.
-- **Assets:** `Stack.assetLibrary()`, asset fetch and query. Use `Asset`, `AssetLibrary`, `AssetModel`, and related callbacks.
-- **Content types:** Content type schema and listing. Use `ContentType`, `ContentTypesModel`, `ContentTypesCallback`.
-- **Sync:** `SyncStack` for sync API. Use existing sync request/response and pagination patterns.
-- **Taxonomy:** Taxonomy entries and structure. Use `Taxonomy` and related API surface.
-- **Official API:** Align with [Content Delivery API](https://www.contentstack.com/docs/apis/content-delivery-api/) for parameters, response shape, and semantics.
-
-### HTTP and retry
-
-- **HTTP:** All CDA requests go through `CSHttpConnection` and the Retrofit `APIService`. Set headers (e.g. User-Agent, auth) per `Constants` and existing request building.
-- **Retry:** Configure via `Config.setRetryOptions(RetryOptions)`. `RetryInterceptor` applies retries per `RetryOptions` (limit, delay, backoff strategy, retryable status codes). Default retryable codes include 408, 429, 502, 503, 504.
-- **Reference:** `CSHttpConnection.java`, `APIService.java`, `RetryOptions.java`, `RetryInterceptor.java`.
-
-### Errors and callbacks
+### Entry points
 
-- **Errors:** Map API errors to the `Error` class (errorMessage, errorCode, errDetails). Pass to the appropriate callback (e.g. `ResultCallBack`) so callers receive a consistent error shape.
-- **Callbacks:** Use existing callback types (`ResultCallBack`, `EntryResultCallBack`, `QueryResultsCallBack`, etc.). Do not change callback contracts without considering backward compatibility.
+- Core usage centers on **`Stack`** and related types (`Query`, `Entry`, `Asset`, sync APIs)—preserve binary compatibility for public methods when possible.
 
-## Key classes
+### Dependencies
 
-- **Entry points:** `Contentstack`, `Stack`, `Config`
-- **CDA:** `Entry`, `Query`, `Asset`, `AssetLibrary`, `ContentType`, `SyncStack`, `Taxonomy`
-- **HTTP / retry:** `CSHttpConnection`, `APIService`, `RetryOptions`, `RetryInterceptor`
-- **Errors / results:** `Error`, `QueryResult`, and callback interfaces in `com.contentstack.sdk`
+- Networking uses **Retrofit/OkHttp**-style stack per `pom.xml`; **Gson** for JSON—keep model classes consistent with API responses.
 
-## References
+### Semver
 
-- [Content Delivery API – Contentstack Docs](https://www.contentstack.com/docs/apis/content-delivery-api/)
-- Project rules: `.cursor/rules/contentstack-java-cda.mdc`, `.cursor/rules/java.mdc`
+- Treat additive changes as minor; breaking signatures or behavior need a **major** bump and migration notes.
diff --git a/skills/dev-workflow/SKILL.md b/skills/dev-workflow/SKILL.md
new file mode 100644
index 00000000..e4ee3484
--- /dev/null
+++ b/skills/dev-workflow/SKILL.md
@@ -0,0 +1,27 @@
+---
+name: dev-workflow
+description: Use for Maven lifecycle, CI, JaCoCo, and branch expectations in contentstack-java.
+---
+
+# Development workflow – contentstack-java
+
+## When to use
+
+- Running builds/tests locally to match CI
+- Preparing a release or snapshot with signing/publish plugins
+
+## Instructions
+
+### Branches
+
+- Integration branches include **`development`**, **`staging`**, and **`master`**—confirm target branch for your PR against team policy.
+
+### Commands
+
+- Typical test run: `mvn clean test -Dgpg.skip=true` (GPG skipped for local dev).
+- CI coverage workflow enables tests via `pom.xml` manipulation—see `.github/workflows/unit-testing.yml` for the exact Maven line.
+- JDK **8** (Temurin) is used in coverage CI—match for parity when debugging Java-8-specific issues.
+
+### JaCoCo
+
+- Reports land under `target/site/jacoco/` after `jacoco:report`—use HTML output to inspect coverage gaps.
diff --git a/skills/framework/SKILL.md b/skills/framework/SKILL.md
index 3d1fc662..0e77d99a 100644
--- a/skills/framework/SKILL.md
+++ b/skills/framework/SKILL.md
@@ -47,8 +47,3 @@ Use this skill when changing configuration, retry behavior, or the HTTP connecti
 - **Retry:** `RetryOptions.java`, `RetryOptions.BackoffStrategy`, `RetryInterceptor.java`, `CustomBackoffStrategy.java`
 - **HTTP:** `CSHttpConnection.java`, `APIService.java`, `CSConnectionRequest.java`, `Constants.java`
 - **Errors/callbacks:** `Error.java`, `ResultCallBack`, and related callback types
-
-## References
-
-- Project rules: `.cursor/rules/contentstack-java-cda.mdc`, `.cursor/rules/java.mdc`
-- CDA skill: `skills/contentstack-java-cda/SKILL.md` for CDA-specific usage of Config and HTTP
diff --git a/skills/java/SKILL.md b/skills/java/SKILL.md
new file mode 100644
index 00000000..d1e13c2f
--- /dev/null
+++ b/skills/java/SKILL.md
@@ -0,0 +1,26 @@
+---
+name: java
+description: Use for Java package layout, language level (8), and project conventions in contentstack-java.
+---
+
+# Java style & layout – contentstack-java
+
+## When to use
+
+- Adding new classes under `src/main/java/com/contentstack/sdk`
+- Refactoring tests under `src/test/java`
+
+## Instructions
+
+### Layout
+
+- Sources: **`src/main/java`**; tests and fixtures: **`src/test/java`** and **`src/test/resources`**.
+- Java **8** language level—avoid newer language features unless the project explicitly upgrades.
+
+### Libraries
+
+- **Lombok** may appear in sources—ensure IDE/lombok setup for contributors; generated code must still compile under CI.
+
+### Style
+
+- Follow existing patterns in nearby classes (callbacks, builders, null handling)—keep javadoc for public API where the repo already documents.
diff --git a/skills/testing/SKILL.md b/skills/testing/SKILL.md
index 630a170f..521891d8 100644
--- a/skills/testing/SKILL.md
+++ b/skills/testing/SKILL.md
@@ -1,53 +1,26 @@
 ---
 name: testing
-description: Use when writing or refactoring tests – JUnit 5, unit vs integration, BaseIntegrationTest, JaCoCo, naming, and test data
+description: Use for JUnit tests, integration (*IT) tests, fixtures, and credentials handling in contentstack-java.
 ---
 
-# Testing – Contentstack Java CDA SDK
-
-Use this skill when adding or refactoring tests in the Java CDA SDK.
+# Testing – contentstack-java
 
 ## When to use
 
-- Writing new unit or integration tests.
-- Refactoring test layout, base classes, or test utilities.
-- Adjusting test configuration (e.g. timeouts, filters) or coverage.
+- Adding unit tests (`Test*` classes) or integration tests (`*IT`)
+- Debugging failures that need stack credentials
 
 ## Instructions
 
-### JUnit 5 and layout
-
-- Use **JUnit 5 (Jupiter)** only. Dependencies and version are in `pom.xml` (junit-jupiter).
-- **Unit tests:** Class name must start with **`Test`** (e.g. `TestEntry`, `TestConfig`). Place under `src/test/java/com/contentstack/sdk/`.
-- **Integration tests:** Class name must end with **`IT`** (e.g. `ContentstackIT`, `SyncStackIT`). Same package. Extend **`BaseIntegrationTest`** when tests need a real stack and shared setup.
-
-### BaseIntegrationTest and timeouts
-
-- **BaseIntegrationTest** provides:
-  - `stack` from `Credentials.getStack()` (uses `.env`).
-  - Timeout constants: `DEFAULT_TIMEOUT_SECONDS`, `PERFORMANCE_TIMEOUT_SECONDS`, `LARGE_DATASET_TIMEOUT_SECONDS`.
-  - Lifecycle: `@BeforeAll` for setup, optional logging.
-- Use **`Assertions.assertTimeout(Duration.ofSeconds(n), () -> { ... })`** for async or long-running operations so tests don’t hang.
-- Reference: `src/test/java/com/contentstack/sdk/BaseIntegrationTest.java`.
-
-### Test data and credentials
-
-- **Credentials:** Use **`Credentials`** for integration tests. Require a `.env` (or equivalent) with stack API key, delivery token, and environment. Do not commit real credentials; document required variables.
-- **Fixtures:** Reuse existing test assets (e.g. under `src/test/` or `target/test-classes/`) where applicable. Use **`TestHelpers`** and other test utils when present.
-
-### Naming and structure
+### Test types
 
-- One test class per production class when possible (e.g. `TestEntry` for `Entry`).
-- Use **`@DisplayName`** for readable test names. Use **`@TestInstance(Lifecycle.PER_CLASS)`** when sharing instance state (e.g. in base integration class).
+- **Unit tests** (`Test*` pattern in CI snippet) exercise SDK logic with mocks/fixtures.
+- **Integration tests** (`*IT`) may call live services—require valid credentials and environment; see `Credentials.java` and test base classes.
 
-### Coverage and execution
+### Running subsets
 
-- **JaCoCo** is configured in `pom.xml`. Reports are generated on `mvn test` (e.g. `target/site/jacoco/`). Some classes are excluded from coverage (see jacoco-maven-plugin `excludes`).
-- **Surefire:** Default runs all tests. Use `-Dtest=TestEntry` for one class, `-Dtest='*IT'` for integration only, `-Dtest='Test*'` for unit only.
-- Maintain or improve coverage when changing production code; add tests for new or modified behavior.
+- Surefire supports `-Dtest=...` patterns documented in `pom.xml`—use to iterate quickly without the full IT suite.
 
-## References
+### Safety
 
-- `pom.xml` – Surefire and JaCoCo plugin configuration
-- `BaseIntegrationTest.java`, `Credentials.java`, `TestHelpers.java`
-- Project rule: `.cursor/rules/testing.mdc`
+- Never commit API keys or delivery tokens; use env/secret patterns already established in tests.