Revert example, README, and skill import changes to reduce PR diff

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Abel Milash

README.md

@@ -209,7 +209,7 @@ a PATCH request; multiple items use the `UpsertMultiple` bulk action.
 > upsert requests will be rejected by Dataverse with a 400 error.
 
 ```python
-from PowerPlatform.Dataverse.models import UpsertItem
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 
 # Upsert a single record
 client.records.upsert("account", [
@@ -346,7 +346,7 @@ query = (client.query.builder("contact")
 For complex logic (OR, NOT, grouping), compose expressions with `&`, `|`, `~`:
 
 ```python
-from PowerPlatform.Dataverse.models import col
+from PowerPlatform.Dataverse.models.filters import col
 
 # OR conditions: (statecode = 0 OR statecode = 1) AND revenue > 100k
 for record in (client.query.builder("account")
@@ -397,7 +397,7 @@ if record:
 **Nested expand with options** -- expand navigation properties with `$select`, `$filter`, `$orderby`, and `$top`:
 
 ```python
-from PowerPlatform.Dataverse.models import ExpandOption
+from PowerPlatform.Dataverse.models.query_builder import ExpandOption
 
 # Expand related tasks with filtering and sorting
 for record in (client.query.builder("account")
@@ -614,14 +614,12 @@ client.tables.delete("new_Product")
 Create relationships between tables using the relationship API. For a complete working example, see [examples/advanced/relationships.py](https://github.com/microsoft/PowerPlatform-DataverseClient-Python/blob/main/examples/advanced/relationships.py).
 
 ```python
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
     OneToManyRelationshipMetadata,
+    ManyToManyRelationshipMetadata,
 )
+from PowerPlatform.Dataverse.models.labels import Label, LocalizedLabel
 
 # Create a one-to-many relationship: Department (1) -> Employee (N)
 # This adds a "Department" lookup field to the Employee table
@@ -823,7 +821,7 @@ The client raises structured exceptions for different error scenarios:
 
 ```python
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.core import HttpError, ValidationError
+from PowerPlatform.Dataverse.core.errors import HttpError, ValidationError
 
 try:
     client.records.retrieve("account", "invalid-id")
@@ -864,7 +862,8 @@ Enable file-based HTTP logging to capture all requests and responses for debuggi
 
 ```python
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.core import DataverseConfig, LogConfig
+from PowerPlatform.Dataverse.core.config import DataverseConfig
+from PowerPlatform.Dataverse.core.log_config import LogConfig
 
 log_cfg = LogConfig(
     log_folder="./my_logs",      # Directory for log files (created if missing)

examples/advanced/alternate_keys_upsert.py

@@ -23,7 +23,7 @@
 import time
 
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import UpsertItem
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 from azure.identity import InteractiveBrowserCredential  # type: ignore
 
 # --- Config ---

examples/advanced/relationships.py

@@ -20,14 +20,13 @@
 import time
 from azure.identity import InteractiveBrowserCredential
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
     OneToManyRelationshipMetadata,
+    ManyToManyRelationshipMetadata,
+    CascadeConfiguration,
 )
+from PowerPlatform.Dataverse.models.labels import Label, LocalizedLabel
 from PowerPlatform.Dataverse.common.constants import (
     CASCADE_BEHAVIOR_NO_CASCADE,
     CASCADE_BEHAVIOR_REMOVE_LINK,

examples/advanced/walkthrough.py

@@ -25,8 +25,9 @@
 from enum import IntEnum
 from azure.identity import InteractiveBrowserCredential
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.core import MetadataError
-from PowerPlatform.Dataverse.models import ExpandOption, col
+from PowerPlatform.Dataverse.core.errors import MetadataError
+from PowerPlatform.Dataverse.models.filters import col
+from PowerPlatform.Dataverse.models.query_builder import ExpandOption
 import requests
 
 

examples/basic/functional_testing.py

@@ -33,20 +33,19 @@
 
 # Import SDK components (assumes installation is already validated)
 from PowerPlatform.Dataverse.client import DataverseClient
-from PowerPlatform.Dataverse.core import HttpError, MetadataError
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.core.errors import HttpError, MetadataError
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
-    ManyToManyRelationshipMetadata,
     OneToManyRelationshipMetadata,
-    UpsertItem,
+    ManyToManyRelationshipMetadata,
+    CascadeConfiguration,
 )
+from PowerPlatform.Dataverse.models.labels import Label, LocalizedLabel
 from PowerPlatform.Dataverse.common.constants import (
     CASCADE_BEHAVIOR_NO_CASCADE,
     CASCADE_BEHAVIOR_REMOVE_LINK,
 )
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 from azure.identity import InteractiveBrowserCredential
 
 

examples/basic/installation_example.py

@@ -60,7 +60,10 @@
 from typing import Optional
 from datetime import datetime
 
-from PowerPlatform.Dataverse.operations import FileOperations, QueryOperations, RecordOperations, TableOperations
+from PowerPlatform.Dataverse.operations.records import RecordOperations
+from PowerPlatform.Dataverse.operations.query import QueryOperations
+from PowerPlatform.Dataverse.operations.tables import TableOperations
+from PowerPlatform.Dataverse.operations.files import FileOperations
 
 
 def validate_imports():
@@ -78,11 +81,11 @@ def validate_imports():
         print(f"  [OK] Client class: PowerPlatform.Dataverse.client.DataverseClient")
 
         # Test submodule imports
-        from PowerPlatform.Dataverse.core import HttpError, MetadataError
+        from PowerPlatform.Dataverse.core.errors import HttpError, MetadataError
 
         print(f"  [OK] Core errors: HttpError, MetadataError")
 
-        from PowerPlatform.Dataverse.core import DataverseConfig
+        from PowerPlatform.Dataverse.core.config import DataverseConfig
 
         print(f"  [OK] Core config: DataverseConfig")
 

src/PowerPlatform/Dataverse/claude_skill/dataverse-sdk-use/SKILL.md

@@ -212,7 +212,7 @@ client.records.update("account", [id1, id2, id3], {"industry": "Technology"})
 Creates or updates records identified by alternate keys. Single item -> PATCH; multiple items -> `UpsertMultiple` bulk action.
 > **Prerequisite**: The table must have an alternate key configured in Dataverse for the columns used in `alternate_key`. Without it, Dataverse will reject the request with a 400 error.
 ```python
-from PowerPlatform.Dataverse.models import UpsertItem
+from PowerPlatform.Dataverse.models.upsert import UpsertItem
 
 # Single upsert
 client.records.upsert("account", [
@@ -403,12 +403,12 @@ client.tables.delete("new_Product")
 
 #### Create One-to-Many Relationship
 ```python
-from PowerPlatform.Dataverse.models import (
-    CascadeConfiguration,
-    Label,
-    LocalizedLabel,
+from PowerPlatform.Dataverse.models.relationship import (
     LookupAttributeMetadata,
     OneToManyRelationshipMetadata,
+    Label,
+    LocalizedLabel,
+    CascadeConfiguration,
 )
 from PowerPlatform.Dataverse.common.constants import CASCADE_BEHAVIOR_REMOVE_LINK
 
@@ -435,7 +435,7 @@ print(f"Created lookup field: {result['lookup_schema_name']}")
 
 #### Create Many-to-Many Relationship
 ```python
-from PowerPlatform.Dataverse.models import ManyToManyRelationshipMetadata
+from PowerPlatform.Dataverse.models.relationship import ManyToManyRelationshipMetadata
 
 relationship = ManyToManyRelationshipMetadata(
     schema_name="new_employee_project",
@@ -532,12 +532,12 @@ print(f"Succeeded: {len(result.succeeded)}, Failed: {len(result.failed)}")
 The SDK provides structured exceptions with detailed error information:
 
 ```python
-from PowerPlatform.Dataverse.core import (
+from PowerPlatform.Dataverse.core.errors import (
     DataverseError,
     HttpError,
-    MetadataError,
-    SQLParseError,
     ValidationError,
+    MetadataError,
+    SQLParseError
 )
 from PowerPlatform.Dataverse.client import DataverseClient