From 8fe8be4c18f7a9dbc7f0ea5148bc8ca572abf85f Mon Sep 17 00:00:00 2001
From: "Ilya (Marshal)" <ilya@marshal.dev>
Date: Tue, 19 Dec 2023 21:12:54 +0100
Subject: [PATCH] New SDK structure

---
 atproto/__init__.py                           |  22 --
 atproto/xrpc_client/models/__init__.py        | 301 ------------------
 docs/Makefile                                 |   2 +-
 docs/fix_title_of_models.py                   |   4 +-
 docs/gen_aliases_db.py                        |   2 +-
 docs/source/aliases_db.py                     | 276 ++++++++--------
 docs/source/atproto/atproto.car.rst           |   7 -
 docs/source/atproto/atproto.cbor.rst          |   7 -
 docs/source/atproto/atproto.cid.rst           |   7 -
 docs/source/atproto/atproto.cli.rst           |   7 -
 ....codegen.clients.generate_async_client.rst |   7 -
 .../atproto.codegen.models.builder.rst        |   7 -
 .../atproto.codegen.models.generator.rst      |   7 -
 .../source/atproto/atproto.codegen.models.rst |  16 -
 .../atproto.codegen.namespaces.builder.rst    |   7 -
 .../atproto/atproto.codegen.namespaces.rst    |  16 -
 docs/source/atproto/atproto.codegen.rst       |  17 -
 docs/source/atproto/atproto.firehose.rst      |  16 -
 .../source/atproto/atproto.lexicon.models.rst |   7 -
 docs/source/atproto/atproto.lexicon.rst       |  16 -
 docs/source/atproto/atproto.nsid.rst          |   7 -
 docs/source/atproto/atproto.rst               |  19 --
 docs/source/atproto/atproto.uri.rst           |   7 -
 ...tproto.xrpc_client.client.async_client.rst |   7 -
 .../atproto.xrpc_client.client.async_raw.rst  |   7 -
 .../atproto.xrpc_client.client.client.rst     |   7 -
 ...proto.xrpc_client.client.methods_mixin.rst |  16 -
 ...pc_client.client.methods_mixin.session.rst |   7 -
 ....xrpc_client.client.methods_mixin.time.rst |   7 -
 .../atproto/atproto.xrpc_client.client.rst    |  28 --
 ...roto.xrpc_client.models.app.bsky.actor.rst |  23 --
 ...app.bsky.actor.search_actors_typeahead.rst |   7 -
 ...roto.xrpc_client.models.app.bsky.embed.rst |  18 --
 ....app.bsky.feed.describe_feed_generator.rst |   7 -
 ...t.models.app.bsky.feed.get_actor_likes.rst |   7 -
 ...t.models.app.bsky.feed.get_author_feed.rst |   7 -
 ...t.models.app.bsky.feed.get_post_thread.rst |   7 -
 ...t.models.app.bsky.feed.get_reposted_by.rst |   7 -
 ...proto.xrpc_client.models.app.bsky.feed.rst |  36 ---
 ...ient.models.app.bsky.graph.get_follows.rst |   7 -
 ...t.models.app.bsky.graph.get_list_mutes.rst |   7 -
 ...client.models.app.bsky.graph.listblock.rst |   7 -
 ....models.app.bsky.graph.mute_actor_list.rst |   7 -
 ...roto.xrpc_client.models.app.bsky.graph.rst |  33 --
 ...app.bsky.notification.get_unread_count.rst |   7 -
 ...ls.app.bsky.notification.register_push.rst |   7 -
 ...pc_client.models.app.bsky.notification.rst |  18 --
 ...dels.app.bsky.notification.update_seen.rst |   7 -
 ..._client.models.app.bsky.richtext.facet.rst |   7 -
 ...o.xrpc_client.models.app.bsky.richtext.rst |  15 -
 .../atproto.xrpc_client.models.app.bsky.rst   |  21 --
 ..._client.models.app.bsky.unspecced.defs.rst |   7 -
 ....models.app.bsky.unspecced.get_popular.rst |   7 -
 ....xrpc_client.models.app.bsky.unspecced.rst |  20 --
 .../atproto.xrpc_client.models.app.rst        |  15 -
 ...odels.com.atproto.admin.delete_account.rst |   7 -
 ...com.atproto.admin.disable_invite_codes.rst |   7 -
 ...els.com.atproto.admin.get_account_info.rst |   7 -
 ...els.com.atproto.admin.get_invite_codes.rst |   7 -
 ...com.atproto.admin.get_moderation_event.rst |   7 -
 ...ient.models.com.atproto.admin.get_repo.rst |   7 -
 ...s.com.atproto.admin.get_subject_status.rst |   7 -
 ...o.xrpc_client.models.com.atproto.admin.rst |  33 --
 ....models.com.atproto.admin.search_repos.rst |   7 -
 ...nt.models.com.atproto.admin.send_email.rst |   7 -
 ...com.atproto.admin.update_account_email.rst |   7 -
 ...ls.com.atproto.identity.resolve_handle.rst |   7 -
 ...rpc_client.models.com.atproto.identity.rst |  16 -
 ....models.com.atproto.label.query_labels.rst |   7 -
 ...o.xrpc_client.models.com.atproto.label.rst |  17 -
 ...s.com.atproto.moderation.create_report.rst |   7 -
 ...ent.models.com.atproto.moderation.defs.rst |   7 -
 ...c_client.models.com.atproto.moderation.rst |  16 -
 ....models.com.atproto.repo.create_record.rst |   7 -
 ....models.com.atproto.repo.delete_record.rst |   7 -
 ....models.com.atproto.repo.describe_repo.rst |   7 -
 ...ent.models.com.atproto.repo.put_record.rst |   7 -
 ...to.xrpc_client.models.com.atproto.repo.rst |  23 --
 ...ent.models.com.atproto.repo.strong_ref.rst |   7 -
 ...nt.models.com.atproto.repo.upload_blob.rst |   7 -
 ...atproto.xrpc_client.models.com.atproto.rst |  22 --
 ...odels.com.atproto.server.confirm_email.rst |   7 -
 ...dels.com.atproto.server.create_account.rst |   7 -
 ...com.atproto.server.create_app_password.rst |   7 -
 ....com.atproto.server.create_invite_code.rst |   7 -
 ...com.atproto.server.create_invite_codes.rst |   7 -
 ...dels.com.atproto.server.create_session.rst |   7 -
 ..._client.models.com.atproto.server.defs.rst |   7 -
 ...dels.com.atproto.server.delete_account.rst |   7 -
 ...dels.com.atproto.server.delete_session.rst |   7 -
 ...els.com.atproto.server.describe_server.rst |   7 -
 ....models.com.atproto.server.get_session.rst |   7 -
 ....com.atproto.server.list_app_passwords.rst |   7 -
 ...els.com.atproto.server.refresh_session.rst |   7 -
 ...com.atproto.server.reserve_signing_key.rst |   7 -
 ...dels.com.atproto.server.reset_password.rst |   7 -
 ...com.atproto.server.revoke_app_password.rst |   7 -
 ....xrpc_client.models.com.atproto.server.rst |  36 ---
 ...models.com.atproto.server.update_email.rst |   7 -
 ...ent.models.com.atproto.sync.get_blocks.rst |   7 -
 ...els.com.atproto.sync.get_latest_commit.rst |   7 -
 ...ent.models.com.atproto.sync.get_record.rst |   7 -
 ...ent.models.com.atproto.sync.list_blobs.rst |   7 -
 ...dels.com.atproto.sync.notify_of_update.rst |   7 -
 ....models.com.atproto.sync.request_crawl.rst |   7 -
 ...to.xrpc_client.models.com.atproto.sync.rst |  26 --
 ...odels.com.atproto.sync.subscribe_repos.rst |   7 -
 ...nt.models.com.atproto.temp.import_repo.rst |   7 -
 ...ient.models.com.atproto.temp.push_blob.rst |   7 -
 ...to.xrpc_client.models.com.atproto.temp.rst |  18 --
 ...dels.com.atproto.temp.transfer_account.rst |   7 -
 .../atproto.xrpc_client.models.com.rst        |  15 -
 .../atproto.xrpc_client.models.common.rst     |   7 -
 .../atproto.xrpc_client.models.languages.rst  |   7 -
 .../atproto/atproto.xrpc_client.models.rst    |  32 --
 ...tproto.xrpc_client.namespaces.async_ns.rst |   7 -
 .../atproto.xrpc_client.namespaces.rst        |  17 -
 ...atproto.xrpc_client.namespaces.sync_ns.rst |   7 -
 docs/source/atproto/atproto.xrpc_client.rst   |  25 --
 docs/source/atproto/atproto.xrpc_server.rst   |   7 -
 docs/source/atproto/atproto_cli.cli.rst       |   7 +
 .../{atproto.utils.rst => atproto_cli.rst}    |   8 +-
 ...=> atproto_client.client.async_client.rst} |   4 +-
 ...st => atproto_client.client.async_raw.rst} |   4 +-
 ...der.rst => atproto_client.client.auth.rst} |   4 +-
 .../atproto/atproto_client.client.base.rst    |   7 +
 .../atproto/atproto_client.client.client.rst  |   7 +
 .../atproto_client.client.methods_mixin.rst   |  16 +
 ...to_client.client.methods_mixin.session.rst |   7 +
 ...proto_client.client.methods_mixin.time.rst |   7 +
 .../atproto/atproto_client.client.raw.rst     |   7 +
 docs/source/atproto/atproto_client.client.rst |  28 ++
 .../atproto/atproto_client.exceptions.rst     |   7 +
 ...oto_client.models.app.bsky.actor.defs.rst} |   4 +-
 ....models.app.bsky.actor.get_preferences.rst |   7 +
 ...ent.models.app.bsky.actor.get_profile.rst} |   4 +-
 ...nt.models.app.bsky.actor.get_profiles.rst} |   4 +-
 ....models.app.bsky.actor.get_suggestions.rst |   7 +
 ...o_client.models.app.bsky.actor.profile.rst |   7 +
 ....models.app.bsky.actor.put_preferences.rst |   7 +
 .../atproto_client.models.app.bsky.actor.rst  |  23 ++
 ...t.models.app.bsky.actor.search_actors.rst} |   4 +-
 ...pp.bsky.actor.search_actors_typeahead.rst} |   4 +-
 ...client.models.app.bsky.embed.external.rst} |   4 +-
 ...o_client.models.app.bsky.embed.images.rst} |   4 +-
 ...to_client.models.app.bsky.embed.record.rst |   7 +
 ...dels.app.bsky.embed.record_with_media.rst} |   4 +-
 .../atproto_client.models.app.bsky.embed.rst  |  18 ++
 ...roto_client.models.app.bsky.feed.defs.rst} |   4 +-
 ...app.bsky.feed.describe_feed_generator.rst} |   4 +-
 ...client.models.app.bsky.feed.generator.rst} |   4 +-
 ....models.app.bsky.feed.get_actor_feeds.rst} |   4 +-
 ....models.app.bsky.feed.get_actor_likes.rst} |   4 +-
 ....models.app.bsky.feed.get_author_feed.rst} |   4 +-
 ..._client.models.app.bsky.feed.get_feed.rst} |   4 +-
 ...dels.app.bsky.feed.get_feed_generator.rst} |   4 +-
 ...els.app.bsky.feed.get_feed_generators.rst} |   4 +-
 ...odels.app.bsky.feed.get_feed_skeleton.rst} |   4 +-
 ...client.models.app.bsky.feed.get_likes.rst} |   4 +-
 ...nt.models.app.bsky.feed.get_list_feed.rst} |   4 +-
 ....models.app.bsky.feed.get_post_thread.rst} |   4 +-
 ...client.models.app.bsky.feed.get_posts.rst} |   4 +-
 ...t.models.app.bsky.feed.get_reposted_by.rst |   7 +
 ...els.app.bsky.feed.get_suggested_feeds.rst} |   4 +-
 ...ent.models.app.bsky.feed.get_timeline.rst} |   4 +-
 ...proto_client.models.app.bsky.feed.like.rst |   7 +
 ...proto_client.models.app.bsky.feed.post.rst |   7 +
 ...oto_client.models.app.bsky.feed.repost.rst |   7 +
 .../atproto_client.models.app.bsky.feed.rst   |  36 +++
 ...ient.models.app.bsky.feed.search_posts.rst |   7 +
 ...client.models.app.bsky.feed.threadgate.rst |   7 +
 ...oto_client.models.app.bsky.graph.block.rst |   7 +
 ...roto_client.models.app.bsky.graph.defs.rst |   7 +
 ...to_client.models.app.bsky.graph.follow.rst |   7 +
 ...ient.models.app.bsky.graph.get_blocks.rst} |   4 +-
 ...t.models.app.bsky.graph.get_followers.rst} |   4 +-
 ...ient.models.app.bsky.graph.get_follows.rst |   7 +
 ...client.models.app.bsky.graph.get_list.rst} |   4 +-
 ...models.app.bsky.graph.get_list_blocks.rst} |   4 +-
 ...t.models.app.bsky.graph.get_list_mutes.rst |   7 +
 ...lient.models.app.bsky.graph.get_lists.rst} |   4 +-
 ...lient.models.app.bsky.graph.get_mutes.rst} |   4 +-
 ....graph.get_suggested_follows_by_actor.rst} |   4 +-
 ...roto_client.models.app.bsky.graph.list.rst |   7 +
 ...client.models.app.bsky.graph.listblock.rst |   7 +
 ..._client.models.app.bsky.graph.listitem.rst |   7 +
 ...ient.models.app.bsky.graph.mute_actor.rst} |   4 +-
 ...models.app.bsky.graph.mute_actor_list.rst} |   4 +-
 .../atproto_client.models.app.bsky.graph.rst  |  33 ++
 ...nt.models.app.bsky.graph.unmute_actor.rst} |   4 +-
 ...dels.app.bsky.graph.unmute_actor_list.rst} |   4 +-
 ...pp.bsky.notification.get_unread_count.rst} |   4 +-
 ....bsky.notification.list_notifications.rst} |   4 +-
 ...s.app.bsky.notification.register_push.rst} |   4 +-
 ...to_client.models.app.bsky.notification.rst |  18 ++
 ...els.app.bsky.notification.update_seen.rst} |   4 +-
 ..._client.models.app.bsky.richtext.facet.rst |   7 +
 ...tproto_client.models.app.bsky.richtext.rst |  15 +
 .../atproto_client.models.app.bsky.rst        |  21 ++
 ..._client.models.app.bsky.unspecced.defs.rst |   7 +
 ....models.app.bsky.unspecced.get_popular.rst |   7 +
 ...unspecced.get_popular_feed_generators.rst} |   4 +-
 ....bsky.unspecced.get_timeline_skeleton.rst} |   4 +-
 ...proto_client.models.app.bsky.unspecced.rst |  20 ++
 ...bsky.unspecced.search_actors_skeleton.rst} |   4 +-
 ....bsky.unspecced.search_posts_skeleton.rst} |   4 +-
 .../atproto/atproto_client.models.app.rst     |  15 +
 .../atproto/atproto_client.models.base.rst    |   7 +
 ...rst => atproto_client.models.blob_ref.rst} |   4 +-
 ...o_client.models.com.atproto.admin.defs.rst |   7 +
 ...dels.com.atproto.admin.delete_account.rst} |   4 +-
 ...atproto.admin.disable_account_invites.rst} |   4 +-
 ...om.atproto.admin.disable_invite_codes.rst} |   4 +-
 ...m.atproto.admin.emit_moderation_event.rst} |   4 +-
 ....atproto.admin.enable_account_invites.rst} |   4 +-
 ...ls.com.atproto.admin.get_account_info.rst} |   4 +-
 ...ls.com.atproto.admin.get_invite_codes.rst} |   4 +-
 ...om.atproto.admin.get_moderation_event.rst} |   4 +-
 ...t.models.com.atproto.admin.get_record.rst} |   4 +-
 ...ient.models.com.atproto.admin.get_repo.rst |   7 +
 ....com.atproto.admin.get_subject_status.rst} |   4 +-
 ...atproto.admin.query_moderation_events.rst} |   4 +-
 ...proto.admin.query_moderation_statuses.rst} |   4 +-
 ...tproto_client.models.com.atproto.admin.rst |  33 ++
 ....models.com.atproto.admin.search_repos.rst |   7 +
 ...nt.models.com.atproto.admin.send_email.rst |   7 +
 ...com.atproto.admin.update_account_email.rst |   7 +
 ...m.atproto.admin.update_account_handle.rst} |   4 +-
 ...m.atproto.admin.update_subject_status.rst} |   4 +-
 ...ls.com.atproto.identity.resolve_handle.rst |   7 +
 ...oto_client.models.com.atproto.identity.rst |  16 +
 ...ls.com.atproto.identity.update_handle.rst} |   4 +-
 ...o_client.models.com.atproto.label.defs.rst |   7 +
 ....models.com.atproto.label.query_labels.rst |   7 +
 ...tproto_client.models.com.atproto.label.rst |  17 +
 ...els.com.atproto.label.subscribe_labels.rst |   7 +
 ....com.atproto.moderation.create_report.rst} |   4 +-
 ...nt.models.com.atproto.moderation.defs.rst} |   4 +-
 ...o_client.models.com.atproto.moderation.rst |  16 +
 ....models.com.atproto.repo.apply_writes.rst} |   4 +-
 ....models.com.atproto.repo.create_record.rst |   7 +
 ....models.com.atproto.repo.delete_record.rst |   7 +
 ...models.com.atproto.repo.describe_repo.rst} |   4 +-
 ...nt.models.com.atproto.repo.get_record.rst} |   4 +-
 ....models.com.atproto.repo.list_records.rst} |   4 +-
 ...nt.models.com.atproto.repo.put_record.rst} |   4 +-
 ...atproto_client.models.com.atproto.repo.rst |  23 ++
 ...ent.models.com.atproto.repo.strong_ref.rst |   7 +
 ...nt.models.com.atproto.repo.upload_blob.rst |   7 +
 .../atproto_client.models.com.atproto.rst     |  22 ++
 ...dels.com.atproto.server.confirm_email.rst} |   4 +-
 ...dels.com.atproto.server.create_account.rst |   7 +
 ...com.atproto.server.create_app_password.rst |   7 +
 ...com.atproto.server.create_invite_code.rst} |   4 +-
 ...com.atproto.server.create_invite_codes.rst |   7 +
 ...dels.com.atproto.server.create_session.rst |   7 +
 ..._client.models.com.atproto.server.defs.rst |   7 +
 ...dels.com.atproto.server.delete_account.rst |   7 +
 ...dels.com.atproto.server.delete_session.rst |   7 +
 ...els.com.atproto.server.describe_server.rst |   7 +
 ...proto.server.get_account_invite_codes.rst} |   4 +-
 ....models.com.atproto.server.get_session.rst |   7 +
 ...com.atproto.server.list_app_passwords.rst} |   4 +-
 ...els.com.atproto.server.refresh_session.rst |   7 +
 ...atproto.server.request_account_delete.rst} |   4 +-
 ...oto.server.request_email_confirmation.rst} |   4 +-
 ...m.atproto.server.request_email_update.rst} |   4 +-
 ...atproto.server.request_password_reset.rst} |   4 +-
 ...com.atproto.server.reserve_signing_key.rst |   7 +
 ...dels.com.atproto.server.reset_password.rst |   7 +
 ...com.atproto.server.revoke_app_password.rst |   7 +
 ...proto_client.models.com.atproto.server.rst |  36 +++
 ...odels.com.atproto.server.update_email.rst} |   4 +-
 ...ient.models.com.atproto.sync.get_blob.rst} |   4 +-
 ...ent.models.com.atproto.sync.get_blocks.rst |   7 +
 ...t.models.com.atproto.sync.get_checkout.rst |   7 +
 ...lient.models.com.atproto.sync.get_head.rst |   7 +
 ...ls.com.atproto.sync.get_latest_commit.rst} |   4 +-
 ...ent.models.com.atproto.sync.get_record.rst |   7 +
 ...lient.models.com.atproto.sync.get_repo.rst |   7 +
 ...ent.models.com.atproto.sync.list_blobs.rst |   7 +
 ...ent.models.com.atproto.sync.list_repos.rst |   7 +
 ...els.com.atproto.sync.notify_of_update.rst} |   4 +-
 ....models.com.atproto.sync.request_crawl.rst |   7 +
 ...atproto_client.models.com.atproto.sync.rst |  26 ++
 ...dels.com.atproto.sync.subscribe_repos.rst} |   4 +-
 ...t.models.com.atproto.temp.fetch_labels.rst |   7 +
 ...nt.models.com.atproto.temp.import_repo.rst |   7 +
 ...ient.models.com.atproto.temp.push_blob.rst |   7 +
 ...atproto_client.models.com.atproto.temp.rst |  18 ++
 ...dels.com.atproto.temp.transfer_account.rst |   7 +
 .../atproto/atproto_client.models.com.rst     |  15 +
 .../atproto/atproto_client.models.common.rst  |   7 +
 ...rst => atproto_client.models.dot_dict.rst} |   4 +-
 ...st => atproto_client.models.languages.rst} |   4 +-
 ...> atproto_client.models.models_loader.rst} |   4 +-
 docs/source/atproto/atproto_client.models.rst |  32 ++
 .../atproto_client.models.type_conversion.rst |   7 +
 ...=> atproto_client.models.unknown_type.rst} |   4 +-
 ...st.rst => atproto_client.models.utils.rst} |   4 +-
 .../atproto_client.namespaces.async_ns.rst    |   7 +
 ...rst => atproto_client.namespaces.base.rst} |   4 +-
 .../atproto/atproto_client.namespaces.rst     |  17 +
 .../atproto_client.namespaces.sync_ns.rst     |   7 +
 ....client.rst => atproto_client.request.rst} |   4 +-
 docs/source/atproto/atproto_client.rst        |  27 ++
 docs/source/atproto/atproto_client.utils.rst  |  15 +
 .../atproto_client.utils.text_builder.rst     |   7 +
 ..._codegen.clients.generate_async_client.rst |   7 +
 .../atproto/atproto_codegen.clients.rst       |  15 +
 ....models.rst => atproto_codegen.consts.rst} |   4 +-
 .../atproto_codegen.models.builder.rst        |   7 +
 .../atproto_codegen.models.generator.rst      |   7 +
 ...clients.rst => atproto_codegen.models.rst} |   7 +-
 .../atproto_codegen.namespaces.builder.rst    |   7 +
 ... atproto_codegen.namespaces.generator.rst} |   4 +-
 .../atproto/atproto_codegen.namespaces.rst    |  16 +
 docs/source/atproto/atproto_codegen.rst       |  26 ++
 ...n.parser.rst => atproto_codegen.utils.rst} |   4 +-
 docs/source/atproto/atproto_core.car.car.rst  |   7 +
 docs/source/atproto/atproto_core.car.rst      |  15 +
 .../source/atproto/atproto_core.cbor.cbor.rst |   7 +
 docs/source/atproto/atproto_core.cbor.rst     |  15 +
 docs/source/atproto/atproto_core.cid.cid.rst  |   7 +
 docs/source/atproto/atproto_core.cid.rst      |  15 +
 .../atproto/atproto_core.exceptions.rst       |   7 +
 .../source/atproto/atproto_core.nsid.nsid.rst |   7 +
 docs/source/atproto/atproto_core.nsid.rst     |  15 +
 docs/source/atproto/atproto_core.rst          |  27 ++
 docs/source/atproto/atproto_core.uri.rst      |  15 +
 docs/source/atproto/atproto_core.uri.uri.rst  |   7 +
 .../atproto/atproto_firehose.client.rst       |   7 +
 .../atproto/atproto_firehose.exceptions.rst   |   7 +
 .../atproto/atproto_firehose.firehose.rst     |   7 +
 .../atproto/atproto_firehose.models.rst       |   7 +
 docs/source/atproto/atproto_firehose.rst      |  18 ++
 .../atproto/atproto_lexicon.exceptions.rst    |   7 +
 .../source/atproto/atproto_lexicon.models.rst |   7 +
 .../source/atproto/atproto_lexicon.parser.rst |   7 +
 docs/source/atproto/atproto_lexicon.rst       |  17 +
 docs/source/atproto/atproto_server.rst        |   7 +
 docs/source/atproto/modules.rst               |  11 +-
 .../{xrpc_clients => atproto_client}/base.rst |   2 +-
 .../client.rst                                |   2 +-
 .../clients.rst                               |   2 +-
 .../{xrpc_clients => atproto_client}/http.rst |   2 +-
 .../{xrpc_clients => atproto_client}/raw.rst  |   2 +-
 docs/source/car.rst                           |   2 +-
 docs/source/cbor.rst                          |   2 +-
 docs/source/cid.rst                           |   2 +-
 docs/source/conf.py                           |   2 +-
 docs/source/firehose.models.rst               |   2 +-
 docs/source/firehose.rst                      |   6 +-
 docs/source/index.rst                         |   2 +-
 docs/source/models.rst                        |  16 +-
 docs/source/namespace.rst                     |   2 +-
 docs/source/nsid.rst                          |   2 +-
 docs/source/text_builder.rst                  |   2 +-
 docs/source/uri.rst                           |   2 +-
 packages/atproto/__init__.py                  |  34 ++
 packages/atproto/exceptions.py                |   4 +
 packages/atproto_cli/__init__.py              |   3 +
 .../atproto_cli/cli.py                        |   9 +-
 packages/atproto_client/__init__.py           |   9 +
 .../atproto_client/client}/__init__.py        |   0
 .../atproto_client}/client/async_client.py    |  19 +-
 .../atproto_client}/client/async_raw.py       |   4 +-
 .../atproto_client}/client/auth.py            |   0
 .../atproto_client}/client/base.py            |   6 +-
 .../atproto_client}/client/client.py          |  19 +-
 .../client/methods_mixin/__init__.py          |   0
 .../client/methods_mixin/session.py           |   6 +-
 .../client/methods_mixin/time.py              |   0
 .../atproto_client}/client/raw.py             |   4 +-
 .../atproto_client}/exceptions.py             |  36 +--
 packages/atproto_client/models/__init__.py    | 297 +++++++++++++++++
 .../atproto_client}/models/app/__init__.py    |   0
 .../models/app/bsky/__init__.py               |   0
 .../models/app/bsky/actor/__init__.py         |   0
 .../models/app/bsky/actor/defs.py             |   4 +-
 .../models/app/bsky/actor/get_preferences.py  |   4 +-
 .../models/app/bsky/actor/get_profile.py      |   2 +-
 .../models/app/bsky/actor/get_profiles.py     |   4 +-
 .../models/app/bsky/actor/get_suggestions.py  |   4 +-
 .../models/app/bsky/actor/profile.py          |   6 +-
 .../models/app/bsky/actor/put_preferences.py  |   4 +-
 .../models/app/bsky/actor/search_actors.py    |   4 +-
 .../app/bsky/actor/search_actors_typeahead.py |   4 +-
 .../models/app/bsky/embed/__init__.py         |   0
 .../models/app/bsky/embed/external.py         |   6 +-
 .../models/app/bsky/embed/images.py           |   6 +-
 .../models/app/bsky/embed/record.py           |   6 +-
 .../app/bsky/embed/record_with_media.py       |   4 +-
 .../models/app/bsky/feed/__init__.py          |   0
 .../models/app/bsky/feed/defs.py              |   6 +-
 .../app/bsky/feed/describe_feed_generator.py  |   4 +-
 .../models/app/bsky/feed/generator.py         |   6 +-
 .../models/app/bsky/feed/get_actor_feeds.py   |   4 +-
 .../models/app/bsky/feed/get_actor_likes.py   |   4 +-
 .../models/app/bsky/feed/get_author_feed.py   |   4 +-
 .../models/app/bsky/feed/get_feed.py          |   4 +-
 .../app/bsky/feed/get_feed_generator.py       |   4 +-
 .../app/bsky/feed/get_feed_generators.py      |   4 +-
 .../models/app/bsky/feed/get_feed_skeleton.py |   4 +-
 .../models/app/bsky/feed/get_likes.py         |   4 +-
 .../models/app/bsky/feed/get_list_feed.py     |   4 +-
 .../models/app/bsky/feed/get_post_thread.py   |   4 +-
 .../models/app/bsky/feed/get_posts.py         |   4 +-
 .../models/app/bsky/feed/get_reposted_by.py   |   4 +-
 .../app/bsky/feed/get_suggested_feeds.py      |   4 +-
 .../models/app/bsky/feed/get_timeline.py      |   4 +-
 .../models/app/bsky/feed/like.py              |   4 +-
 .../models/app/bsky/feed/post.py              |   4 +-
 .../models/app/bsky/feed/repost.py            |   4 +-
 .../models/app/bsky/feed/search_posts.py      |   4 +-
 .../models/app/bsky/feed/threadgate.py        |   4 +-
 .../models/app/bsky/graph/__init__.py         |   0
 .../models/app/bsky/graph/block.py            |   2 +-
 .../models/app/bsky/graph/defs.py             |   4 +-
 .../models/app/bsky/graph/follow.py           |   2 +-
 .../models/app/bsky/graph/get_blocks.py       |   4 +-
 .../models/app/bsky/graph/get_followers.py    |   4 +-
 .../models/app/bsky/graph/get_follows.py      |   4 +-
 .../models/app/bsky/graph/get_list.py         |   4 +-
 .../models/app/bsky/graph/get_list_blocks.py  |   4 +-
 .../models/app/bsky/graph/get_list_mutes.py   |   4 +-
 .../models/app/bsky/graph/get_lists.py        |   4 +-
 .../models/app/bsky/graph/get_mutes.py        |   4 +-
 .../graph/get_suggested_follows_by_actor.py   |   4 +-
 .../models/app/bsky/graph/list.py             |   6 +-
 .../models/app/bsky/graph/listblock.py        |   2 +-
 .../models/app/bsky/graph/listitem.py         |   2 +-
 .../models/app/bsky/graph/mute_actor.py       |   2 +-
 .../models/app/bsky/graph/mute_actor_list.py  |   2 +-
 .../models/app/bsky/graph/unmute_actor.py     |   2 +-
 .../app/bsky/graph/unmute_actor_list.py       |   2 +-
 .../models/app/bsky/notification/__init__.py  |   0
 .../app/bsky/notification/get_unread_count.py |   2 +-
 .../bsky/notification/list_notifications.py   |   6 +-
 .../app/bsky/notification/register_push.py    |   2 +-
 .../app/bsky/notification/update_seen.py      |   2 +-
 .../models/app/bsky/richtext/__init__.py      |   0
 .../models/app/bsky/richtext/facet.py         |   4 +-
 .../models/app/bsky/unspecced/__init__.py     |   0
 .../models/app/bsky/unspecced/defs.py         |   2 +-
 .../models/app/bsky/unspecced/get_popular.py  |   4 +-
 .../unspecced/get_popular_feed_generators.py  |   4 +-
 .../bsky/unspecced/get_timeline_skeleton.py   |   4 +-
 .../bsky/unspecced/search_actors_skeleton.py  |   4 +-
 .../bsky/unspecced/search_posts_skeleton.py   |   4 +-
 .../atproto_client}/models/base.py            |   2 +-
 .../atproto_client}/models/blob_ref.py        |   4 +-
 .../atproto_client}/models/com/__init__.py    |   0
 .../models/com/atproto/__init__.py            |   0
 .../models/com/atproto/admin/__init__.py      |   0
 .../models/com/atproto/admin/defs.py          |   6 +-
 .../com/atproto/admin/delete_account.py       |   2 +-
 .../atproto/admin/disable_account_invites.py  |   2 +-
 .../com/atproto/admin/disable_invite_codes.py |   2 +-
 .../atproto/admin/emit_moderation_event.py    |   4 +-
 .../atproto/admin/enable_account_invites.py   |   2 +-
 .../com/atproto/admin/get_account_info.py     |   2 +-
 .../com/atproto/admin/get_invite_codes.py     |   4 +-
 .../com/atproto/admin/get_moderation_event.py |   2 +-
 .../models/com/atproto/admin/get_record.py    |   2 +-
 .../models/com/atproto/admin/get_repo.py      |   2 +-
 .../com/atproto/admin/get_subject_status.py   |   4 +-
 .../atproto/admin/query_moderation_events.py  |   4 +-
 .../admin/query_moderation_statuses.py        |   4 +-
 .../models/com/atproto/admin/search_repos.py  |   4 +-
 .../models/com/atproto/admin/send_email.py    |   2 +-
 .../com/atproto/admin/update_account_email.py |   2 +-
 .../atproto/admin/update_account_handle.py    |   2 +-
 .../atproto/admin/update_subject_status.py    |   4 +-
 .../models/com/atproto/identity/__init__.py   |   0
 .../com/atproto/identity/resolve_handle.py    |   2 +-
 .../com/atproto/identity/update_handle.py     |   2 +-
 .../models/com/atproto/label/__init__.py      |   0
 .../models/com/atproto/label/defs.py          |   4 +-
 .../models/com/atproto/label/query_labels.py  |   4 +-
 .../com/atproto/label/subscribe_labels.py     |   4 +-
 .../models/com/atproto/moderation/__init__.py |   0
 .../com/atproto/moderation/create_report.py   |   4 +-
 .../models/com/atproto/moderation/defs.py     |   2 +-
 .../models/com/atproto/repo/__init__.py       |   0
 .../models/com/atproto/repo/apply_writes.py   |   6 +-
 .../models/com/atproto/repo/create_record.py  |   4 +-
 .../models/com/atproto/repo/delete_record.py  |   2 +-
 .../models/com/atproto/repo/describe_repo.py  |   4 +-
 .../models/com/atproto/repo/get_record.py     |   4 +-
 .../models/com/atproto/repo/list_records.py   |   6 +-
 .../models/com/atproto/repo/put_record.py     |   4 +-
 .../models/com/atproto/repo/strong_ref.py     |   2 +-
 .../models/com/atproto/repo/upload_blob.py    |   4 +-
 .../models/com/atproto/server/__init__.py     |   0
 .../com/atproto/server/confirm_email.py       |   2 +-
 .../com/atproto/server/create_account.py      |   4 +-
 .../com/atproto/server/create_app_password.py |   2 +-
 .../com/atproto/server/create_invite_code.py  |   2 +-
 .../com/atproto/server/create_invite_codes.py |   4 +-
 .../com/atproto/server/create_session.py      |   4 +-
 .../models/com/atproto/server/defs.py         |   4 +-
 .../com/atproto/server/delete_account.py      |   2 +-
 .../com/atproto/server/delete_session.py      |   0
 .../com/atproto/server/describe_server.py     |   4 +-
 .../server/get_account_invite_codes.py        |   4 +-
 .../models/com/atproto/server/get_session.py  |   4 +-
 .../com/atproto/server/list_app_passwords.py  |   4 +-
 .../com/atproto/server/refresh_session.py     |   4 +-
 .../atproto/server/request_account_delete.py  |   0
 .../server/request_email_confirmation.py      |   0
 .../atproto/server/request_email_update.py    |   2 +-
 .../atproto/server/request_password_reset.py  |   2 +-
 .../com/atproto/server/reserve_signing_key.py |   2 +-
 .../com/atproto/server/reset_password.py      |   2 +-
 .../com/atproto/server/revoke_app_password.py |   2 +-
 .../models/com/atproto/server/update_email.py |   2 +-
 .../models/com/atproto/sync/__init__.py       |   0
 .../models/com/atproto/sync/get_blob.py       |   2 +-
 .../models/com/atproto/sync/get_blocks.py     |   2 +-
 .../models/com/atproto/sync/get_checkout.py   |   2 +-
 .../models/com/atproto/sync/get_head.py       |   2 +-
 .../com/atproto/sync/get_latest_commit.py     |   2 +-
 .../models/com/atproto/sync/get_record.py     |   2 +-
 .../models/com/atproto/sync/get_repo.py       |   2 +-
 .../models/com/atproto/sync/list_blobs.py     |   2 +-
 .../models/com/atproto/sync/list_repos.py     |   4 +-
 .../com/atproto/sync/notify_of_update.py      |   2 +-
 .../models/com/atproto/sync/request_crawl.py  |   2 +-
 .../com/atproto/sync/subscribe_repos.py       |   7 +-
 .../models/com/atproto/temp/__init__.py       |   0
 .../models/com/atproto/temp/fetch_labels.py   |   4 +-
 .../models/com/atproto/temp/import_repo.py    |   2 +-
 .../models/com/atproto/temp/push_blob.py      |   2 +-
 .../com/atproto/temp/transfer_account.py      |   4 +-
 .../atproto_client}/models/common.py          |   0
 .../atproto_client}/models/dot_dict.py        |   2 +-
 .../atproto_client}/models/languages.py       |   0
 .../atproto_client}/models/models_loader.py   |  12 +-
 .../atproto_client}/models/type_conversion.py |   2 +-
 .../atproto_client}/models/unknown_type.py    |   4 +-
 .../atproto_client}/models/utils.py           |  16 +-
 .../atproto_client/namespaces}/__init__.py    |   0
 .../atproto_client}/namespaces/async_ns.py    |   8 +-
 .../atproto_client}/namespaces/base.py        |   4 +-
 .../atproto_client}/namespaces/sync_ns.py     |   8 +-
 .../atproto_client}/request.py                |   6 +-
 .../atproto_client}/utils/__init__.py         |   0
 .../atproto_client}/utils/text_builder.py     |   2 +-
 .../atproto_codegen}/__init__.py              |   0
 .../atproto_codegen/clients}/__init__.py      |   0
 .../clients/generate_async_client.py          |   5 +-
 packages/atproto_codegen/consts.py            |  15 +
 .../atproto_codegen/models}/__init__.py       |   0
 .../atproto_codegen}/models/builder.py        |   6 +-
 .../atproto_codegen}/models/generator.py      |  45 +--
 .../atproto_codegen/namespaces}/__init__.py   |   0
 .../atproto_codegen}/namespaces/builder.py    |   6 +-
 .../atproto_codegen}/namespaces/generator.py  |  37 ++-
 .../atproto_codegen/utils.py                  |  19 +-
 .../atproto_core}/__init__.py                 |   0
 packages/atproto_core/car/__init__.py         |   3 +
 .../atproto_core/car/car.py                   |   4 +-
 packages/atproto_core/cbor/__init__.py        |   3 +
 .../atproto_core/cbor/cbor.py                 |   2 +-
 packages/atproto_core/cid/__init__.py         |   6 +
 .../atproto_core/cid/cid.py                   |   0
 packages/atproto_core/exceptions.py           |  18 ++
 packages/atproto_core/nsid/__init__.py        |   3 +
 .../atproto_core/nsid/nsid.py                 |   2 +-
 packages/atproto_core/uri/__init__.py         |   3 +
 .../atproto_core/uri/uri.py                   |   2 +-
 packages/atproto_firehose/__init__.py         |  17 +
 .../atproto_firehose}/client.py               |  13 +-
 packages/atproto_firehose/exceptions.py       |   9 +
 .../atproto_firehose/firehose.py              |  33 +-
 .../atproto_firehose}/models.py               |   8 +-
 packages/atproto_lexicon/__init__.py          |   0
 packages/atproto_lexicon/exceptions.py        |   5 +
 .../atproto_lexicon}/models.py                |   0
 .../atproto_lexicon}/parser.py                |   4 +-
 .../atproto_server}/__init__.py               |   0
 pyproject.toml                                |  25 +-
 test.py                                       |  59 +++-
 tests/models/fetch_test_data.py               |   6 +-
 .../test_changed_lexicon_compatability.py     |   7 +-
 tests/models/tests/test_custom_record.py      |   7 +-
 tests/models/tests/test_did_doc.py            |   7 +-
 tests/models/tests/test_dot_dict.py           |   2 +-
 .../models/tests/test_extended_like_record.py |   5 +-
 .../models/tests/test_extended_post_record.py |   5 +-
 tests/models/tests/test_feed_record.py        |   6 +-
 tests/models/tests/test_get_follows.py        |   5 +-
 tests/models/tests/test_is_record_type.py     |   7 +-
 tests/models/tests/test_like_record.py        |   5 +-
 tests/models/tests/test_post_record.py        |   5 +-
 tests/models/tests/test_resolve_handle.py     |   5 +-
 .../test_thread_view_post_with_embed_media.py |   5 +-
 tests/test_lexicon_parser.py                  |   2 +-
 tests/test_nsid.py                            |   2 +-
 tests/test_uri.py                             |   2 +-
 601 files changed, 2686 insertions(+), 2399 deletions(-)
 delete mode 100644 atproto/__init__.py
 delete mode 100644 atproto/xrpc_client/models/__init__.py
 delete mode 100644 docs/source/atproto/atproto.car.rst
 delete mode 100644 docs/source/atproto/atproto.cbor.rst
 delete mode 100644 docs/source/atproto/atproto.cid.rst
 delete mode 100644 docs/source/atproto/atproto.cli.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.clients.generate_async_client.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.models.builder.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.models.generator.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.models.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.namespaces.builder.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.namespaces.rst
 delete mode 100644 docs/source/atproto/atproto.codegen.rst
 delete mode 100644 docs/source/atproto/atproto.firehose.rst
 delete mode 100644 docs/source/atproto/atproto.lexicon.models.rst
 delete mode 100644 docs/source/atproto/atproto.lexicon.rst
 delete mode 100644 docs/source/atproto/atproto.nsid.rst
 delete mode 100644 docs/source/atproto/atproto.uri.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.async_client.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.async_raw.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.client.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.methods_mixin.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.methods_mixin.session.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.methods_mixin.time.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.client.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_likes.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_author_feed.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_post_thread.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_reposted_by.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_follows.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_mutes.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listblock.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor_list.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.get_unread_count.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.register_push.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.update_seen.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.facet.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.defs.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.app.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.delete_account.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_account_info.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_invite_codes.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_moderation_event.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_repo.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_subject_status.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.search_repos.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.send_email.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_email.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.resolve_handle.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.query_labels.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.create_report.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.defs.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.create_record.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.delete_record.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.describe_repo.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.put_record.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.strong_ref.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.upload_blob.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.confirm_email.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_account.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_app_password.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_code.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_codes.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_session.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.defs.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_account.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_session.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.describe_server.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_session.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.list_app_passwords.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.refresh_session.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reserve_signing_key.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reset_password.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.revoke_app_password.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.update_email.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blocks.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_latest_commit.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_record.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_blobs.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.notify_of_update.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.request_crawl.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.subscribe_repos.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.import_repo.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.push_blob.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.transfer_account.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.com.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.common.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.languages.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.models.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.namespaces.async_ns.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.namespaces.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.namespaces.sync_ns.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_client.rst
 delete mode 100644 docs/source/atproto/atproto.xrpc_server.rst
 create mode 100644 docs/source/atproto/atproto_cli.cli.rst
 rename docs/source/atproto/{atproto.utils.rst => atproto_cli.rst} (55%)
 rename docs/source/atproto/{atproto.xrpc_client.namespaces.base.rst => atproto_client.client.async_client.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.utils.rst => atproto_client.client.async_raw.rst} (51%)
 rename docs/source/atproto/{atproto.utils.text_builder.rst => atproto_client.client.auth.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.client.base.rst
 create mode 100644 docs/source/atproto/atproto_client.client.client.rst
 create mode 100644 docs/source/atproto/atproto_client.client.methods_mixin.rst
 create mode 100644 docs/source/atproto/atproto_client.client.methods_mixin.session.rst
 create mode 100644 docs/source/atproto/atproto_client.client.methods_mixin.time.rst
 create mode 100644 docs/source/atproto/atproto_client.client.raw.rst
 create mode 100644 docs/source/atproto/atproto_client.client.rst
 create mode 100644 docs/source/atproto/atproto_client.exceptions.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.models_loader.rst => atproto_client.models.app.bsky.actor.defs.rst} (55%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.actor.get_preferences.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.label.defs.rst => atproto_client.models.app.bsky.actor.get_profile.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.listitem.rst => atproto_client.models.app.bsky.actor.get_profiles.rst} (52%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.actor.get_suggestions.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.actor.profile.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.actor.put_preferences.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.actor.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_list.rst => atproto_client.models.app.bsky.actor.search_actors.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.label.subscribe_labels.rst => atproto_client.models.app.bsky.actor.search_actors_typeahead.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.like.rst => atproto_client.models.app.bsky.embed.external.rst} (54%)
 rename docs/source/atproto/{atproto.xrpc_client.models.type_conversion.rst => atproto_client.models.app.bsky.embed.images.rst} (54%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.embed.record.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.search_actors.rst => atproto_client.models.app.bsky.embed.record_with_media.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.embed.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.unknown_type.rst => atproto_client.models.app.bsky.feed.defs.rst} (55%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_feed_generator.rst => atproto_client.models.app.bsky.feed.describe_feed_generator.rst} (55%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.post.rst => atproto_client.models.app.bsky.feed.generator.rst} (54%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.sync.get_head.rst => atproto_client.models.app.bsky.feed.get_actor_feeds.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_blocks.rst => atproto_client.models.app.bsky.feed.get_actor_likes.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.mute_actor.rst => atproto_client.models.app.bsky.feed.get_author_feed.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.defs.rst => atproto_client.models.app.bsky.feed.get_feed.rst} (54%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.get_record.rst => atproto_client.models.app.bsky.feed.get_feed_generator.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.temp.fetch_labels.rst => atproto_client.models.app.bsky.feed.get_feed_generators.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.get_profiles.rst => atproto_client.models.app.bsky.feed.get_feed_skeleton.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.list.rst => atproto_client.models.app.bsky.feed.get_likes.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.threadgate.rst => atproto_client.models.app.bsky.feed.get_list_feed.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.sync.get_blob.rst => atproto_client.models.app.bsky.feed.get_post_thread.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.defs.rst => atproto_client.models.app.bsky.feed.get_posts.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.get_reposted_by.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.repo.apply_writes.rst => atproto_client.models.app.bsky.feed.get_suggested_feeds.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.profile.rst => atproto_client.models.app.bsky.feed.get_timeline.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.like.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.post.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.repost.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.search_posts.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.feed.threadgate.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.block.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.defs.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.follow.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.embed.images.rst => atproto_client.models.app.bsky.graph.get_blocks.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_likes.rst => atproto_client.models.app.bsky.graph.get_followers.rst} (52%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.get_follows.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.defs.rst => atproto_client.models.app.bsky.graph.get_list.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.get_profile.rst => atproto_client.models.app.bsky.graph.get_list_blocks.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_mutes.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.repost.rst => atproto_client.models.app.bsky.graph.get_lists.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.block.rst => atproto_client.models.app.bsky.graph.get_mutes.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst => atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst} (61%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.list.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.listblock.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.listitem.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.embed.record.rst => atproto_client.models.app.bsky.graph.mute_actor.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_timeline.rst => atproto_client.models.app.bsky.graph.mute_actor_list.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.graph.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.embed.external.rst => atproto_client.models.app.bsky.graph.unmute_actor.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_list_feed.rst => atproto_client.models.app.bsky.graph.unmute_actor_list.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_feed_generators.rst => atproto_client.models.app.bsky.notification.get_unread_count.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.notification.list_notifications.rst => atproto_client.models.app.bsky.notification.list_notifications.rst} (64%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds.rst => atproto_client.models.app.bsky.notification.register_push.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.notification.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_followers.rst => atproto_client.models.app.bsky.notification.update_seen.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.richtext.facet.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.richtext.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.unspecced.defs.rst
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators.rst => atproto_client.models.app.bsky.unspecced.get_popular_feed_generators.rst} (61%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton.rst => atproto_client.models.app.bsky.unspecced.get_timeline_skeleton.rst} (63%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.bsky.unspecced.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton.rst => atproto_client.models.app.bsky.unspecced.search_actors_skeleton.rst} (63%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton.rst => atproto_client.models.app.bsky.unspecced.search_posts_skeleton.rst} (63%)
 create mode 100644 docs/source/atproto/atproto_client.models.app.rst
 create mode 100644 docs/source/atproto/atproto_client.models.base.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.base.rst => atproto_client.models.blob_ref.rst} (60%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.defs.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.unmute_actor.rst => atproto_client.models.com.atproto.admin.delete_account.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.disable_account_invites.rst => atproto_client.models.com.atproto.admin.disable_account_invites.rst} (63%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds.rst => atproto_client.models.com.atproto.admin.disable_invite_codes.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event.rst => atproto_client.models.com.atproto.admin.emit_moderation_event.rst} (64%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.enable_account_invites.rst => atproto_client.models.com.atproto.admin.enable_account_invites.rst} (63%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.get_preferences.rst => atproto_client.models.com.atproto.admin.get_account_info.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.get_suggestions.rst => atproto_client.models.com.atproto.admin.get_invite_codes.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.identity.update_handle.rst => atproto_client.models.com.atproto.admin.get_moderation_event.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_posts.rst => atproto_client.models.com.atproto.admin.get_record.rst} (52%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.get_repo.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton.rst => atproto_client.models.com.atproto.admin.get_subject_status.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.query_moderation_events.rst => atproto_client.models.com.atproto.admin.query_moderation_events.rst} (63%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses.rst => atproto_client.models.com.atproto.admin.query_moderation_statuses.rst} (62%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.search_repos.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.send_email.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_email.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.update_account_handle.rst => atproto_client.models.com.atproto.admin.update_account_handle.rst} (64%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.update_subject_status.rst => atproto_client.models.com.atproto.admin.update_subject_status.rst} (64%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.identity.resolve_handle.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.identity.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.sync.get_checkout.rst => atproto_client.models.com.atproto.identity.update_handle.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.label.defs.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.label.query_labels.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.label.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.label.subscribe_labels.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_list_blocks.rst => atproto_client.models.com.atproto.moderation.create_report.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.admin.defs.rst => atproto_client.models.com.atproto.moderation.defs.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.moderation.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_mutes.rst => atproto_client.models.com.atproto.repo.apply_writes.rst} (54%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.repo.create_record.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.repo.delete_record.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.sync.get_repo.rst => atproto_client.models.com.atproto.repo.describe_repo.rst} (54%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.get_feed.rst => atproto_client.models.com.atproto.repo.get_record.rst} (53%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.get_lists.rst => atproto_client.models.com.atproto.repo.list_records.rst} (52%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.generator.rst => atproto_client.models.com.atproto.repo.put_record.rst} (52%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.repo.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.repo.strong_ref.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.repo.upload_blob.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.repo.get_record.rst => atproto_client.models.com.atproto.server.confirm_email.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.create_account.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.create_app_password.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.embed.record_with_media.rst => atproto_client.models.com.atproto.server.create_invite_code.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_codes.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.create_session.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.defs.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.delete_account.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.delete_session.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.describe_server.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes.rst => atproto_client.models.com.atproto.server.get_account_invite_codes.rst} (62%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.get_session.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list.rst => atproto_client.models.com.atproto.server.list_app_passwords.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.refresh_session.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.server.request_account_delete.rst => atproto_client.models.com.atproto.server.request_account_delete.rst} (63%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.server.request_email_confirmation.rst => atproto_client.models.com.atproto.server.request_email_confirmation.rst} (62%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.server.request_email_update.rst => atproto_client.models.com.atproto.server.request_email_update.rst} (64%)
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.server.request_password_reset.rst => atproto_client.models.com.atproto.server.request_password_reset.rst} (63%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.reserve_signing_key.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.reset_password.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.revoke_app_password.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.server.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.feed.search_posts.rst => atproto_client.models.com.atproto.server.update_email.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.graph.follow.rst => atproto_client.models.com.atproto.sync.get_blob.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.get_blocks.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.get_checkout.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.get_head.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.app.bsky.actor.put_preferences.rst => atproto_client.models.com.atproto.sync.get_latest_commit.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.get_record.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.get_repo.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.list_blobs.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.list_repos.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.repo.list_records.rst => atproto_client.models.com.atproto.sync.notify_of_update.rst} (51%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.request_crawl.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.sync.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.com.atproto.sync.list_repos.rst => atproto_client.models.com.atproto.sync.subscribe_repos.rst} (54%)
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.temp.fetch_labels.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.temp.import_repo.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.temp.push_blob.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.temp.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.atproto.temp.transfer_account.rst
 create mode 100644 docs/source/atproto/atproto_client.models.com.rst
 create mode 100644 docs/source/atproto/atproto_client.models.common.rst
 rename docs/source/atproto/{atproto.xrpc_client.client.auth.rst => atproto_client.models.dot_dict.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.client.base.rst => atproto_client.models.languages.rst} (51%)
 rename docs/source/atproto/{atproto.xrpc_client.models.blob_ref.rst => atproto_client.models.models_loader.rst} (57%)
 create mode 100644 docs/source/atproto/atproto_client.models.rst
 create mode 100644 docs/source/atproto/atproto_client.models.type_conversion.rst
 rename docs/source/atproto/{atproto.codegen.namespaces.generator.rst => atproto_client.models.unknown_type.rst} (50%)
 rename docs/source/atproto/{atproto.xrpc_client.request.rst => atproto_client.models.utils.rst} (53%)
 create mode 100644 docs/source/atproto/atproto_client.namespaces.async_ns.rst
 rename docs/source/atproto/{atproto.xrpc_client.client.raw.rst => atproto_client.namespaces.base.rst} (52%)
 create mode 100644 docs/source/atproto/atproto_client.namespaces.rst
 create mode 100644 docs/source/atproto/atproto_client.namespaces.sync_ns.rst
 rename docs/source/atproto/{atproto.firehose.client.rst => atproto_client.request.rst} (54%)
 create mode 100644 docs/source/atproto/atproto_client.rst
 create mode 100644 docs/source/atproto/atproto_client.utils.rst
 create mode 100644 docs/source/atproto/atproto_client.utils.text_builder.rst
 create mode 100644 docs/source/atproto/atproto_codegen.clients.generate_async_client.rst
 create mode 100644 docs/source/atproto/atproto_codegen.clients.rst
 rename docs/source/atproto/{atproto.firehose.models.rst => atproto_codegen.consts.rst} (54%)
 create mode 100644 docs/source/atproto/atproto_codegen.models.builder.rst
 create mode 100644 docs/source/atproto/atproto_codegen.models.generator.rst
 rename docs/source/atproto/{atproto.codegen.clients.rst => atproto_codegen.models.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_codegen.namespaces.builder.rst
 rename docs/source/atproto/{atproto.xrpc_client.models.dot_dict.rst => atproto_codegen.namespaces.generator.rst} (50%)
 create mode 100644 docs/source/atproto/atproto_codegen.namespaces.rst
 create mode 100644 docs/source/atproto/atproto_codegen.rst
 rename docs/source/atproto/{atproto.lexicon.parser.rst => atproto_codegen.utils.rst} (55%)
 create mode 100644 docs/source/atproto/atproto_core.car.car.rst
 create mode 100644 docs/source/atproto/atproto_core.car.rst
 create mode 100644 docs/source/atproto/atproto_core.cbor.cbor.rst
 create mode 100644 docs/source/atproto/atproto_core.cbor.rst
 create mode 100644 docs/source/atproto/atproto_core.cid.cid.rst
 create mode 100644 docs/source/atproto/atproto_core.cid.rst
 create mode 100644 docs/source/atproto/atproto_core.exceptions.rst
 create mode 100644 docs/source/atproto/atproto_core.nsid.nsid.rst
 create mode 100644 docs/source/atproto/atproto_core.nsid.rst
 create mode 100644 docs/source/atproto/atproto_core.rst
 create mode 100644 docs/source/atproto/atproto_core.uri.rst
 create mode 100644 docs/source/atproto/atproto_core.uri.uri.rst
 create mode 100644 docs/source/atproto/atproto_firehose.client.rst
 create mode 100644 docs/source/atproto/atproto_firehose.exceptions.rst
 create mode 100644 docs/source/atproto/atproto_firehose.firehose.rst
 create mode 100644 docs/source/atproto/atproto_firehose.models.rst
 create mode 100644 docs/source/atproto/atproto_firehose.rst
 create mode 100644 docs/source/atproto/atproto_lexicon.exceptions.rst
 create mode 100644 docs/source/atproto/atproto_lexicon.models.rst
 create mode 100644 docs/source/atproto/atproto_lexicon.parser.rst
 create mode 100644 docs/source/atproto/atproto_lexicon.rst
 create mode 100644 docs/source/atproto/atproto_server.rst
 rename docs/source/{xrpc_clients => atproto_client}/base.rst (62%)
 rename docs/source/{xrpc_clients => atproto_client}/client.rst (64%)
 rename docs/source/{xrpc_clients => atproto_client}/clients.rst (79%)
 rename docs/source/{xrpc_clients => atproto_client}/http.rst (64%)
 rename docs/source/{xrpc_clients => atproto_client}/raw.rst (62%)
 create mode 100644 packages/atproto/__init__.py
 create mode 100644 packages/atproto/exceptions.py
 create mode 100644 packages/atproto_cli/__init__.py
 rename atproto/cli/__init__.py => packages/atproto_cli/cli.py (93%)
 create mode 100644 packages/atproto_client/__init__.py
 rename {atproto/codegen/clients => packages/atproto_client/client}/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/async_client.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/async_raw.py (78%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/auth.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/base.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/client.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/methods_mixin/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/methods_mixin/session.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/methods_mixin/time.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/client/raw.py (78%)
 rename {atproto => packages/atproto_client}/exceptions.py (54%)
 create mode 100644 packages/atproto_client/models/__init__.py
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/defs.py (98%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/get_preferences.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/get_profile.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/get_profiles.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/get_suggestions.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/profile.py (88%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/put_preferences.py (88%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/search_actors.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/actor/search_actors_typeahead.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/embed/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/embed/external.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/embed/images.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/embed/record.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/embed/record_with_media.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/defs.py (98%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/describe_feed_generator.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/generator.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_actor_feeds.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_actor_likes.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_author_feed.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_feed.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_feed_generator.py (91%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_feed_generators.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_feed_skeleton.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_likes.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_list_feed.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_post_thread.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_posts.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_reposted_by.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_suggested_feeds.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/get_timeline.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/like.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/post.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/repost.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/search_posts.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/feed/threadgate.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/block.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/defs.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/follow.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_blocks.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_followers.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_follows.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_list.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_list_blocks.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_list_mutes.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_lists.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_mutes.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/get_suggested_follows_by_actor.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/list.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/listblock.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/listitem.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/mute_actor.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/mute_actor_list.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/unmute_actor.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/graph/unmute_actor_list.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/notification/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/notification/get_unread_count.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/notification/list_notifications.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/notification/register_push.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/notification/update_seen.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/richtext/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/richtext/facet.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/defs.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/get_popular.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/get_popular_feed_generators.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/get_timeline_skeleton.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/search_actors_skeleton.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/app/bsky/unspecced/search_posts_skeleton.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/base.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/blob_ref.py (89%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/defs.py (99%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/delete_account.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/disable_account_invites.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/disable_invite_codes.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/emit_moderation_event.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/enable_account_invites.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_account_info.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_invite_codes.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_moderation_event.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_record.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_repo.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/get_subject_status.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/query_moderation_events.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/query_moderation_statuses.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/search_repos.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/send_email.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/update_account_email.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/update_account_handle.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/admin/update_subject_status.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/identity/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/identity/resolve_handle.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/identity/update_handle.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/label/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/label/defs.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/label/query_labels.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/label/subscribe_labels.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/moderation/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/moderation/create_report.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/moderation/defs.py (97%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/apply_writes.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/create_record.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/delete_record.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/describe_repo.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/get_record.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/list_records.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/put_record.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/strong_ref.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/repo/upload_blob.py (85%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/confirm_email.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/create_account.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/create_app_password.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/create_invite_code.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/create_invite_codes.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/create_session.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/defs.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/delete_account.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/delete_session.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/describe_server.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/get_account_invite_codes.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/get_session.py (87%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/list_app_passwords.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/refresh_session.py (87%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/request_account_delete.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/request_email_confirmation.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/request_email_update.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/request_password_reset.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/reserve_signing_key.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/reset_password.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/revoke_app_password.py (92%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/server/update_email.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_blob.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_blocks.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_checkout.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_head.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_latest_commit.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_record.py (95%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/get_repo.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/list_blobs.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/list_repos.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/notify_of_update.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/request_crawl.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/sync/subscribe_repos.py (96%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/temp/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/temp/fetch_labels.py (91%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/temp/import_repo.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/temp/push_blob.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/com/atproto/temp/transfer_account.py (90%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/common.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/dot_dict.py (99%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/languages.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/models_loader.py (78%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/type_conversion.py (94%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/unknown_type.py (93%)
 rename {atproto/xrpc_client => packages/atproto_client}/models/utils.py (93%)
 rename {atproto/codegen/models => packages/atproto_client/namespaces}/__init__.py (100%)
 rename {atproto/xrpc_client => packages/atproto_client}/namespaces/async_ns.py (99%)
 rename {atproto/xrpc_client => packages/atproto_client}/namespaces/base.py (75%)
 rename {atproto/xrpc_client => packages/atproto_client}/namespaces/sync_ns.py (99%)
 rename {atproto/xrpc_client => packages/atproto_client}/request.py (96%)
 rename {atproto => packages/atproto_client}/utils/__init__.py (100%)
 rename {atproto => packages/atproto_client}/utils/text_builder.py (99%)
 rename {atproto/codegen/namespaces => packages/atproto_codegen}/__init__.py (100%)
 rename {atproto/lexicon => packages/atproto_codegen/clients}/__init__.py (100%)
 rename {atproto/codegen => packages/atproto_codegen}/clients/generate_async_client.py (86%)
 create mode 100644 packages/atproto_codegen/consts.py
 rename {atproto/xrpc_client => packages/atproto_codegen/models}/__init__.py (100%)
 rename {atproto/codegen => packages/atproto_codegen}/models/builder.py (96%)
 rename {atproto/codegen => packages/atproto_codegen}/models/generator.py (95%)
 rename {atproto/xrpc_client/client => packages/atproto_codegen/namespaces}/__init__.py (100%)
 rename {atproto/codegen => packages/atproto_codegen}/namespaces/builder.py (95%)
 rename {atproto/codegen => packages/atproto_codegen}/namespaces/generator.py (94%)
 rename atproto/codegen/__init__.py => packages/atproto_codegen/utils.py (85%)
 rename {atproto/xrpc_client/namespaces => packages/atproto_core}/__init__.py (100%)
 create mode 100644 packages/atproto_core/car/__init__.py
 rename atproto/car/__init__.py => packages/atproto_core/car/car.py (95%)
 create mode 100644 packages/atproto_core/cbor/__init__.py
 rename atproto/cbor/__init__.py => packages/atproto_core/cbor/cbor.py (93%)
 create mode 100644 packages/atproto_core/cid/__init__.py
 rename atproto/cid/__init__.py => packages/atproto_core/cid/cid.py (100%)
 create mode 100644 packages/atproto_core/exceptions.py
 create mode 100644 packages/atproto_core/nsid/__init__.py
 rename atproto/nsid/__init__.py => packages/atproto_core/nsid/nsid.py (98%)
 create mode 100644 packages/atproto_core/uri/__init__.py
 rename atproto/uri/__init__.py => packages/atproto_core/uri/uri.py (98%)
 create mode 100644 packages/atproto_firehose/__init__.py
 rename {atproto/firehose => packages/atproto_firehose}/client.py (95%)
 create mode 100644 packages/atproto_firehose/exceptions.py
 rename atproto/firehose/__init__.py => packages/atproto_firehose/firehose.py (83%)
 rename {atproto/firehose => packages/atproto_firehose}/models.py (94%)
 create mode 100644 packages/atproto_lexicon/__init__.py
 create mode 100644 packages/atproto_lexicon/exceptions.py
 rename {atproto/lexicon => packages/atproto_lexicon}/models.py (100%)
 rename {atproto/lexicon => packages/atproto_lexicon}/parser.py (94%)
 rename {atproto/xrpc_server => packages/atproto_server}/__init__.py (100%)

diff --git a/atproto/__init__.py b/atproto/__init__.py
deleted file mode 100644
index 8f859058..00000000
--- a/atproto/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from .car import CAR
-from .cid import CID, CIDType
-from .firehose import models as firehose_models
-from .nsid import NSID
-from .uri import AtUri
-from .xrpc_client import models
-from .xrpc_client.client.async_client import AsyncClient
-from .xrpc_client.client.client import Client
-
-__version__ = '0.0.0'  # placeholder. Dynamic version from Git Tag
-__all__ = [
-    '__version__',
-    'AsyncClient',
-    'Client',
-    'models',
-    'firehose_models',
-    'NSID',
-    'CAR',
-    'CID',
-    'CIDType',
-    'AtUri',
-]
diff --git a/atproto/xrpc_client/models/__init__.py b/atproto/xrpc_client/models/__init__.py
deleted file mode 100644
index fff78211..00000000
--- a/atproto/xrpc_client/models/__init__.py
+++ /dev/null
@@ -1,301 +0,0 @@
-from atproto.xrpc_client.models.app.bsky.actor import defs as AppBskyActorDefs
-from atproto.xrpc_client.models.app.bsky.actor import get_preferences as AppBskyActorGetPreferences
-from atproto.xrpc_client.models.app.bsky.actor import get_profile as AppBskyActorGetProfile
-from atproto.xrpc_client.models.app.bsky.actor import get_profiles as AppBskyActorGetProfiles
-from atproto.xrpc_client.models.app.bsky.actor import get_suggestions as AppBskyActorGetSuggestions
-from atproto.xrpc_client.models.app.bsky.actor import profile as AppBskyActorProfile
-from atproto.xrpc_client.models.app.bsky.actor import put_preferences as AppBskyActorPutPreferences
-from atproto.xrpc_client.models.app.bsky.actor import search_actors as AppBskyActorSearchActors
-from atproto.xrpc_client.models.app.bsky.actor import search_actors_typeahead as AppBskyActorSearchActorsTypeahead
-from atproto.xrpc_client.models.app.bsky.embed import external as AppBskyEmbedExternal
-from atproto.xrpc_client.models.app.bsky.embed import images as AppBskyEmbedImages
-from atproto.xrpc_client.models.app.bsky.embed import record as AppBskyEmbedRecord
-from atproto.xrpc_client.models.app.bsky.embed import record_with_media as AppBskyEmbedRecordWithMedia
-from atproto.xrpc_client.models.app.bsky.feed import defs as AppBskyFeedDefs
-from atproto.xrpc_client.models.app.bsky.feed import describe_feed_generator as AppBskyFeedDescribeFeedGenerator
-from atproto.xrpc_client.models.app.bsky.feed import generator as AppBskyFeedGenerator
-from atproto.xrpc_client.models.app.bsky.feed import get_actor_feeds as AppBskyFeedGetActorFeeds
-from atproto.xrpc_client.models.app.bsky.feed import get_actor_likes as AppBskyFeedGetActorLikes
-from atproto.xrpc_client.models.app.bsky.feed import get_author_feed as AppBskyFeedGetAuthorFeed
-from atproto.xrpc_client.models.app.bsky.feed import get_feed as AppBskyFeedGetFeed
-from atproto.xrpc_client.models.app.bsky.feed import get_feed_generator as AppBskyFeedGetFeedGenerator
-from atproto.xrpc_client.models.app.bsky.feed import get_feed_generators as AppBskyFeedGetFeedGenerators
-from atproto.xrpc_client.models.app.bsky.feed import get_feed_skeleton as AppBskyFeedGetFeedSkeleton
-from atproto.xrpc_client.models.app.bsky.feed import get_likes as AppBskyFeedGetLikes
-from atproto.xrpc_client.models.app.bsky.feed import get_list_feed as AppBskyFeedGetListFeed
-from atproto.xrpc_client.models.app.bsky.feed import get_post_thread as AppBskyFeedGetPostThread
-from atproto.xrpc_client.models.app.bsky.feed import get_posts as AppBskyFeedGetPosts
-from atproto.xrpc_client.models.app.bsky.feed import get_reposted_by as AppBskyFeedGetRepostedBy
-from atproto.xrpc_client.models.app.bsky.feed import get_suggested_feeds as AppBskyFeedGetSuggestedFeeds
-from atproto.xrpc_client.models.app.bsky.feed import get_timeline as AppBskyFeedGetTimeline
-from atproto.xrpc_client.models.app.bsky.feed import like as AppBskyFeedLike
-from atproto.xrpc_client.models.app.bsky.feed import post as AppBskyFeedPost
-from atproto.xrpc_client.models.app.bsky.feed import repost as AppBskyFeedRepost
-from atproto.xrpc_client.models.app.bsky.feed import search_posts as AppBskyFeedSearchPosts
-from atproto.xrpc_client.models.app.bsky.feed import threadgate as AppBskyFeedThreadgate
-from atproto.xrpc_client.models.app.bsky.graph import block as AppBskyGraphBlock
-from atproto.xrpc_client.models.app.bsky.graph import defs as AppBskyGraphDefs
-from atproto.xrpc_client.models.app.bsky.graph import follow as AppBskyGraphFollow
-from atproto.xrpc_client.models.app.bsky.graph import get_blocks as AppBskyGraphGetBlocks
-from atproto.xrpc_client.models.app.bsky.graph import get_followers as AppBskyGraphGetFollowers
-from atproto.xrpc_client.models.app.bsky.graph import get_follows as AppBskyGraphGetFollows
-from atproto.xrpc_client.models.app.bsky.graph import get_list as AppBskyGraphGetList
-from atproto.xrpc_client.models.app.bsky.graph import get_list_blocks as AppBskyGraphGetListBlocks
-from atproto.xrpc_client.models.app.bsky.graph import get_list_mutes as AppBskyGraphGetListMutes
-from atproto.xrpc_client.models.app.bsky.graph import get_lists as AppBskyGraphGetLists
-from atproto.xrpc_client.models.app.bsky.graph import get_mutes as AppBskyGraphGetMutes
-from atproto.xrpc_client.models.app.bsky.graph import (
-    get_suggested_follows_by_actor as AppBskyGraphGetSuggestedFollowsByActor,
-)
-from atproto.xrpc_client.models.app.bsky.graph import list as AppBskyGraphList
-from atproto.xrpc_client.models.app.bsky.graph import listblock as AppBskyGraphListblock
-from atproto.xrpc_client.models.app.bsky.graph import listitem as AppBskyGraphListitem
-from atproto.xrpc_client.models.app.bsky.graph import mute_actor as AppBskyGraphMuteActor
-from atproto.xrpc_client.models.app.bsky.graph import mute_actor_list as AppBskyGraphMuteActorList
-from atproto.xrpc_client.models.app.bsky.graph import unmute_actor as AppBskyGraphUnmuteActor
-from atproto.xrpc_client.models.app.bsky.graph import unmute_actor_list as AppBskyGraphUnmuteActorList
-from atproto.xrpc_client.models.app.bsky.notification import get_unread_count as AppBskyNotificationGetUnreadCount
-from atproto.xrpc_client.models.app.bsky.notification import list_notifications as AppBskyNotificationListNotifications
-from atproto.xrpc_client.models.app.bsky.notification import register_push as AppBskyNotificationRegisterPush
-from atproto.xrpc_client.models.app.bsky.notification import update_seen as AppBskyNotificationUpdateSeen
-from atproto.xrpc_client.models.app.bsky.richtext import facet as AppBskyRichtextFacet
-from atproto.xrpc_client.models.app.bsky.unspecced import defs as AppBskyUnspeccedDefs
-from atproto.xrpc_client.models.app.bsky.unspecced import get_popular as AppBskyUnspeccedGetPopular
-from atproto.xrpc_client.models.app.bsky.unspecced import (
-    get_popular_feed_generators as AppBskyUnspeccedGetPopularFeedGenerators,
-)
-from atproto.xrpc_client.models.app.bsky.unspecced import get_timeline_skeleton as AppBskyUnspeccedGetTimelineSkeleton
-from atproto.xrpc_client.models.app.bsky.unspecced import search_actors_skeleton as AppBskyUnspeccedSearchActorsSkeleton
-from atproto.xrpc_client.models.app.bsky.unspecced import search_posts_skeleton as AppBskyUnspeccedSearchPostsSkeleton
-from atproto.xrpc_client.models.com.atproto.admin import defs as ComAtprotoAdminDefs
-from atproto.xrpc_client.models.com.atproto.admin import delete_account as ComAtprotoAdminDeleteAccount
-from atproto.xrpc_client.models.com.atproto.admin import disable_account_invites as ComAtprotoAdminDisableAccountInvites
-from atproto.xrpc_client.models.com.atproto.admin import disable_invite_codes as ComAtprotoAdminDisableInviteCodes
-from atproto.xrpc_client.models.com.atproto.admin import emit_moderation_event as ComAtprotoAdminEmitModerationEvent
-from atproto.xrpc_client.models.com.atproto.admin import enable_account_invites as ComAtprotoAdminEnableAccountInvites
-from atproto.xrpc_client.models.com.atproto.admin import get_account_info as ComAtprotoAdminGetAccountInfo
-from atproto.xrpc_client.models.com.atproto.admin import get_invite_codes as ComAtprotoAdminGetInviteCodes
-from atproto.xrpc_client.models.com.atproto.admin import get_moderation_event as ComAtprotoAdminGetModerationEvent
-from atproto.xrpc_client.models.com.atproto.admin import get_record as ComAtprotoAdminGetRecord
-from atproto.xrpc_client.models.com.atproto.admin import get_repo as ComAtprotoAdminGetRepo
-from atproto.xrpc_client.models.com.atproto.admin import get_subject_status as ComAtprotoAdminGetSubjectStatus
-from atproto.xrpc_client.models.com.atproto.admin import query_moderation_events as ComAtprotoAdminQueryModerationEvents
-from atproto.xrpc_client.models.com.atproto.admin import (
-    query_moderation_statuses as ComAtprotoAdminQueryModerationStatuses,
-)
-from atproto.xrpc_client.models.com.atproto.admin import search_repos as ComAtprotoAdminSearchRepos
-from atproto.xrpc_client.models.com.atproto.admin import send_email as ComAtprotoAdminSendEmail
-from atproto.xrpc_client.models.com.atproto.admin import update_account_email as ComAtprotoAdminUpdateAccountEmail
-from atproto.xrpc_client.models.com.atproto.admin import update_account_handle as ComAtprotoAdminUpdateAccountHandle
-from atproto.xrpc_client.models.com.atproto.admin import update_subject_status as ComAtprotoAdminUpdateSubjectStatus
-from atproto.xrpc_client.models.com.atproto.identity import resolve_handle as ComAtprotoIdentityResolveHandle
-from atproto.xrpc_client.models.com.atproto.identity import update_handle as ComAtprotoIdentityUpdateHandle
-from atproto.xrpc_client.models.com.atproto.label import defs as ComAtprotoLabelDefs
-from atproto.xrpc_client.models.com.atproto.label import query_labels as ComAtprotoLabelQueryLabels
-from atproto.xrpc_client.models.com.atproto.label import subscribe_labels as ComAtprotoLabelSubscribeLabels
-from atproto.xrpc_client.models.com.atproto.moderation import create_report as ComAtprotoModerationCreateReport
-from atproto.xrpc_client.models.com.atproto.moderation import defs as ComAtprotoModerationDefs
-from atproto.xrpc_client.models.com.atproto.repo import apply_writes as ComAtprotoRepoApplyWrites
-from atproto.xrpc_client.models.com.atproto.repo import create_record as ComAtprotoRepoCreateRecord
-from atproto.xrpc_client.models.com.atproto.repo import delete_record as ComAtprotoRepoDeleteRecord
-from atproto.xrpc_client.models.com.atproto.repo import describe_repo as ComAtprotoRepoDescribeRepo
-from atproto.xrpc_client.models.com.atproto.repo import get_record as ComAtprotoRepoGetRecord
-from atproto.xrpc_client.models.com.atproto.repo import list_records as ComAtprotoRepoListRecords
-from atproto.xrpc_client.models.com.atproto.repo import put_record as ComAtprotoRepoPutRecord
-from atproto.xrpc_client.models.com.atproto.repo import strong_ref as ComAtprotoRepoStrongRef
-from atproto.xrpc_client.models.com.atproto.repo import upload_blob as ComAtprotoRepoUploadBlob
-from atproto.xrpc_client.models.com.atproto.server import confirm_email as ComAtprotoServerConfirmEmail
-from atproto.xrpc_client.models.com.atproto.server import create_account as ComAtprotoServerCreateAccount
-from atproto.xrpc_client.models.com.atproto.server import create_app_password as ComAtprotoServerCreateAppPassword
-from atproto.xrpc_client.models.com.atproto.server import create_invite_code as ComAtprotoServerCreateInviteCode
-from atproto.xrpc_client.models.com.atproto.server import create_invite_codes as ComAtprotoServerCreateInviteCodes
-from atproto.xrpc_client.models.com.atproto.server import create_session as ComAtprotoServerCreateSession
-from atproto.xrpc_client.models.com.atproto.server import defs as ComAtprotoServerDefs
-from atproto.xrpc_client.models.com.atproto.server import delete_account as ComAtprotoServerDeleteAccount
-from atproto.xrpc_client.models.com.atproto.server import delete_session as ComAtprotoServerDeleteSession
-from atproto.xrpc_client.models.com.atproto.server import describe_server as ComAtprotoServerDescribeServer
-from atproto.xrpc_client.models.com.atproto.server import (
-    get_account_invite_codes as ComAtprotoServerGetAccountInviteCodes,
-)
-from atproto.xrpc_client.models.com.atproto.server import get_session as ComAtprotoServerGetSession
-from atproto.xrpc_client.models.com.atproto.server import list_app_passwords as ComAtprotoServerListAppPasswords
-from atproto.xrpc_client.models.com.atproto.server import refresh_session as ComAtprotoServerRefreshSession
-from atproto.xrpc_client.models.com.atproto.server import request_account_delete as ComAtprotoServerRequestAccountDelete
-from atproto.xrpc_client.models.com.atproto.server import (
-    request_email_confirmation as ComAtprotoServerRequestEmailConfirmation,
-)
-from atproto.xrpc_client.models.com.atproto.server import request_email_update as ComAtprotoServerRequestEmailUpdate
-from atproto.xrpc_client.models.com.atproto.server import request_password_reset as ComAtprotoServerRequestPasswordReset
-from atproto.xrpc_client.models.com.atproto.server import reserve_signing_key as ComAtprotoServerReserveSigningKey
-from atproto.xrpc_client.models.com.atproto.server import reset_password as ComAtprotoServerResetPassword
-from atproto.xrpc_client.models.com.atproto.server import revoke_app_password as ComAtprotoServerRevokeAppPassword
-from atproto.xrpc_client.models.com.atproto.server import update_email as ComAtprotoServerUpdateEmail
-from atproto.xrpc_client.models.com.atproto.sync import get_blob as ComAtprotoSyncGetBlob
-from atproto.xrpc_client.models.com.atproto.sync import get_blocks as ComAtprotoSyncGetBlocks
-from atproto.xrpc_client.models.com.atproto.sync import get_checkout as ComAtprotoSyncGetCheckout
-from atproto.xrpc_client.models.com.atproto.sync import get_head as ComAtprotoSyncGetHead
-from atproto.xrpc_client.models.com.atproto.sync import get_latest_commit as ComAtprotoSyncGetLatestCommit
-from atproto.xrpc_client.models.com.atproto.sync import get_record as ComAtprotoSyncGetRecord
-from atproto.xrpc_client.models.com.atproto.sync import get_repo as ComAtprotoSyncGetRepo
-from atproto.xrpc_client.models.com.atproto.sync import list_blobs as ComAtprotoSyncListBlobs
-from atproto.xrpc_client.models.com.atproto.sync import list_repos as ComAtprotoSyncListRepos
-from atproto.xrpc_client.models.com.atproto.sync import notify_of_update as ComAtprotoSyncNotifyOfUpdate
-from atproto.xrpc_client.models.com.atproto.sync import request_crawl as ComAtprotoSyncRequestCrawl
-from atproto.xrpc_client.models.com.atproto.sync import subscribe_repos as ComAtprotoSyncSubscribeRepos
-from atproto.xrpc_client.models.com.atproto.temp import fetch_labels as ComAtprotoTempFetchLabels
-from atproto.xrpc_client.models.com.atproto.temp import import_repo as ComAtprotoTempImportRepo
-from atproto.xrpc_client.models.com.atproto.temp import push_blob as ComAtprotoTempPushBlob
-from atproto.xrpc_client.models.com.atproto.temp import transfer_account as ComAtprotoTempTransferAccount
-from atproto.xrpc_client.models.models_loader import load_models
-from atproto.xrpc_client.models.utils import (
-    create_strong_ref,
-    get_model_as_dict,
-    get_model_as_json,
-    get_or_create,
-    is_record_type,
-)
-
-
-class _Ids:
-    AppBskyActorDefs: str = 'app.bsky.actor.defs'
-    AppBskyActorGetPreferences: str = 'app.bsky.actor.getPreferences'
-    AppBskyActorGetProfile: str = 'app.bsky.actor.getProfile'
-    AppBskyActorGetProfiles: str = 'app.bsky.actor.getProfiles'
-    AppBskyActorGetSuggestions: str = 'app.bsky.actor.getSuggestions'
-    AppBskyActorProfile: str = 'app.bsky.actor.profile'
-    AppBskyActorPutPreferences: str = 'app.bsky.actor.putPreferences'
-    AppBskyActorSearchActors: str = 'app.bsky.actor.searchActors'
-    AppBskyActorSearchActorsTypeahead: str = 'app.bsky.actor.searchActorsTypeahead'
-    AppBskyEmbedExternal: str = 'app.bsky.embed.external'
-    AppBskyEmbedImages: str = 'app.bsky.embed.images'
-    AppBskyEmbedRecord: str = 'app.bsky.embed.record'
-    AppBskyEmbedRecordWithMedia: str = 'app.bsky.embed.recordWithMedia'
-    AppBskyFeedDefs: str = 'app.bsky.feed.defs'
-    AppBskyFeedDescribeFeedGenerator: str = 'app.bsky.feed.describeFeedGenerator'
-    AppBskyFeedGenerator: str = 'app.bsky.feed.generator'
-    AppBskyFeedGetActorFeeds: str = 'app.bsky.feed.getActorFeeds'
-    AppBskyFeedGetActorLikes: str = 'app.bsky.feed.getActorLikes'
-    AppBskyFeedGetAuthorFeed: str = 'app.bsky.feed.getAuthorFeed'
-    AppBskyFeedGetFeed: str = 'app.bsky.feed.getFeed'
-    AppBskyFeedGetFeedGenerator: str = 'app.bsky.feed.getFeedGenerator'
-    AppBskyFeedGetFeedGenerators: str = 'app.bsky.feed.getFeedGenerators'
-    AppBskyFeedGetFeedSkeleton: str = 'app.bsky.feed.getFeedSkeleton'
-    AppBskyFeedGetLikes: str = 'app.bsky.feed.getLikes'
-    AppBskyFeedGetListFeed: str = 'app.bsky.feed.getListFeed'
-    AppBskyFeedGetPostThread: str = 'app.bsky.feed.getPostThread'
-    AppBskyFeedGetPosts: str = 'app.bsky.feed.getPosts'
-    AppBskyFeedGetRepostedBy: str = 'app.bsky.feed.getRepostedBy'
-    AppBskyFeedGetSuggestedFeeds: str = 'app.bsky.feed.getSuggestedFeeds'
-    AppBskyFeedGetTimeline: str = 'app.bsky.feed.getTimeline'
-    AppBskyFeedLike: str = 'app.bsky.feed.like'
-    AppBskyFeedPost: str = 'app.bsky.feed.post'
-    AppBskyFeedRepost: str = 'app.bsky.feed.repost'
-    AppBskyFeedSearchPosts: str = 'app.bsky.feed.searchPosts'
-    AppBskyFeedThreadgate: str = 'app.bsky.feed.threadgate'
-    AppBskyGraphBlock: str = 'app.bsky.graph.block'
-    AppBskyGraphDefs: str = 'app.bsky.graph.defs'
-    AppBskyGraphFollow: str = 'app.bsky.graph.follow'
-    AppBskyGraphGetBlocks: str = 'app.bsky.graph.getBlocks'
-    AppBskyGraphGetFollowers: str = 'app.bsky.graph.getFollowers'
-    AppBskyGraphGetFollows: str = 'app.bsky.graph.getFollows'
-    AppBskyGraphGetList: str = 'app.bsky.graph.getList'
-    AppBskyGraphGetListBlocks: str = 'app.bsky.graph.getListBlocks'
-    AppBskyGraphGetListMutes: str = 'app.bsky.graph.getListMutes'
-    AppBskyGraphGetLists: str = 'app.bsky.graph.getLists'
-    AppBskyGraphGetMutes: str = 'app.bsky.graph.getMutes'
-    AppBskyGraphGetSuggestedFollowsByActor: str = 'app.bsky.graph.getSuggestedFollowsByActor'
-    AppBskyGraphList: str = 'app.bsky.graph.list'
-    AppBskyGraphListblock: str = 'app.bsky.graph.listblock'
-    AppBskyGraphListitem: str = 'app.bsky.graph.listitem'
-    AppBskyGraphMuteActor: str = 'app.bsky.graph.muteActor'
-    AppBskyGraphMuteActorList: str = 'app.bsky.graph.muteActorList'
-    AppBskyGraphUnmuteActor: str = 'app.bsky.graph.unmuteActor'
-    AppBskyGraphUnmuteActorList: str = 'app.bsky.graph.unmuteActorList'
-    AppBskyNotificationGetUnreadCount: str = 'app.bsky.notification.getUnreadCount'
-    AppBskyNotificationListNotifications: str = 'app.bsky.notification.listNotifications'
-    AppBskyNotificationRegisterPush: str = 'app.bsky.notification.registerPush'
-    AppBskyNotificationUpdateSeen: str = 'app.bsky.notification.updateSeen'
-    AppBskyRichtextFacet: str = 'app.bsky.richtext.facet'
-    AppBskyUnspeccedDefs: str = 'app.bsky.unspecced.defs'
-    AppBskyUnspeccedGetPopular: str = 'app.bsky.unspecced.getPopular'
-    AppBskyUnspeccedGetPopularFeedGenerators: str = 'app.bsky.unspecced.getPopularFeedGenerators'
-    AppBskyUnspeccedGetTimelineSkeleton: str = 'app.bsky.unspecced.getTimelineSkeleton'
-    AppBskyUnspeccedSearchActorsSkeleton: str = 'app.bsky.unspecced.searchActorsSkeleton'
-    AppBskyUnspeccedSearchPostsSkeleton: str = 'app.bsky.unspecced.searchPostsSkeleton'
-    ComAtprotoAdminDefs: str = 'com.atproto.admin.defs'
-    ComAtprotoAdminDeleteAccount: str = 'com.atproto.admin.deleteAccount'
-    ComAtprotoAdminDisableAccountInvites: str = 'com.atproto.admin.disableAccountInvites'
-    ComAtprotoAdminDisableInviteCodes: str = 'com.atproto.admin.disableInviteCodes'
-    ComAtprotoAdminEmitModerationEvent: str = 'com.atproto.admin.emitModerationEvent'
-    ComAtprotoAdminEnableAccountInvites: str = 'com.atproto.admin.enableAccountInvites'
-    ComAtprotoAdminGetAccountInfo: str = 'com.atproto.admin.getAccountInfo'
-    ComAtprotoAdminGetInviteCodes: str = 'com.atproto.admin.getInviteCodes'
-    ComAtprotoAdminGetModerationEvent: str = 'com.atproto.admin.getModerationEvent'
-    ComAtprotoAdminGetRecord: str = 'com.atproto.admin.getRecord'
-    ComAtprotoAdminGetRepo: str = 'com.atproto.admin.getRepo'
-    ComAtprotoAdminGetSubjectStatus: str = 'com.atproto.admin.getSubjectStatus'
-    ComAtprotoAdminQueryModerationEvents: str = 'com.atproto.admin.queryModerationEvents'
-    ComAtprotoAdminQueryModerationStatuses: str = 'com.atproto.admin.queryModerationStatuses'
-    ComAtprotoAdminSearchRepos: str = 'com.atproto.admin.searchRepos'
-    ComAtprotoAdminSendEmail: str = 'com.atproto.admin.sendEmail'
-    ComAtprotoAdminUpdateAccountEmail: str = 'com.atproto.admin.updateAccountEmail'
-    ComAtprotoAdminUpdateAccountHandle: str = 'com.atproto.admin.updateAccountHandle'
-    ComAtprotoAdminUpdateSubjectStatus: str = 'com.atproto.admin.updateSubjectStatus'
-    ComAtprotoIdentityResolveHandle: str = 'com.atproto.identity.resolveHandle'
-    ComAtprotoIdentityUpdateHandle: str = 'com.atproto.identity.updateHandle'
-    ComAtprotoLabelDefs: str = 'com.atproto.label.defs'
-    ComAtprotoLabelQueryLabels: str = 'com.atproto.label.queryLabels'
-    ComAtprotoLabelSubscribeLabels: str = 'com.atproto.label.subscribeLabels'
-    ComAtprotoModerationCreateReport: str = 'com.atproto.moderation.createReport'
-    ComAtprotoModerationDefs: str = 'com.atproto.moderation.defs'
-    ComAtprotoRepoApplyWrites: str = 'com.atproto.repo.applyWrites'
-    ComAtprotoRepoCreateRecord: str = 'com.atproto.repo.createRecord'
-    ComAtprotoRepoDeleteRecord: str = 'com.atproto.repo.deleteRecord'
-    ComAtprotoRepoDescribeRepo: str = 'com.atproto.repo.describeRepo'
-    ComAtprotoRepoGetRecord: str = 'com.atproto.repo.getRecord'
-    ComAtprotoRepoListRecords: str = 'com.atproto.repo.listRecords'
-    ComAtprotoRepoPutRecord: str = 'com.atproto.repo.putRecord'
-    ComAtprotoRepoStrongRef: str = 'com.atproto.repo.strongRef'
-    ComAtprotoRepoUploadBlob: str = 'com.atproto.repo.uploadBlob'
-    ComAtprotoServerConfirmEmail: str = 'com.atproto.server.confirmEmail'
-    ComAtprotoServerCreateAccount: str = 'com.atproto.server.createAccount'
-    ComAtprotoServerCreateAppPassword: str = 'com.atproto.server.createAppPassword'
-    ComAtprotoServerCreateInviteCode: str = 'com.atproto.server.createInviteCode'
-    ComAtprotoServerCreateInviteCodes: str = 'com.atproto.server.createInviteCodes'
-    ComAtprotoServerCreateSession: str = 'com.atproto.server.createSession'
-    ComAtprotoServerDefs: str = 'com.atproto.server.defs'
-    ComAtprotoServerDeleteAccount: str = 'com.atproto.server.deleteAccount'
-    ComAtprotoServerDeleteSession: str = 'com.atproto.server.deleteSession'
-    ComAtprotoServerDescribeServer: str = 'com.atproto.server.describeServer'
-    ComAtprotoServerGetAccountInviteCodes: str = 'com.atproto.server.getAccountInviteCodes'
-    ComAtprotoServerGetSession: str = 'com.atproto.server.getSession'
-    ComAtprotoServerListAppPasswords: str = 'com.atproto.server.listAppPasswords'
-    ComAtprotoServerRefreshSession: str = 'com.atproto.server.refreshSession'
-    ComAtprotoServerRequestAccountDelete: str = 'com.atproto.server.requestAccountDelete'
-    ComAtprotoServerRequestEmailConfirmation: str = 'com.atproto.server.requestEmailConfirmation'
-    ComAtprotoServerRequestEmailUpdate: str = 'com.atproto.server.requestEmailUpdate'
-    ComAtprotoServerRequestPasswordReset: str = 'com.atproto.server.requestPasswordReset'
-    ComAtprotoServerReserveSigningKey: str = 'com.atproto.server.reserveSigningKey'
-    ComAtprotoServerResetPassword: str = 'com.atproto.server.resetPassword'
-    ComAtprotoServerRevokeAppPassword: str = 'com.atproto.server.revokeAppPassword'
-    ComAtprotoServerUpdateEmail: str = 'com.atproto.server.updateEmail'
-    ComAtprotoSyncGetBlob: str = 'com.atproto.sync.getBlob'
-    ComAtprotoSyncGetBlocks: str = 'com.atproto.sync.getBlocks'
-    ComAtprotoSyncGetCheckout: str = 'com.atproto.sync.getCheckout'
-    ComAtprotoSyncGetHead: str = 'com.atproto.sync.getHead'
-    ComAtprotoSyncGetLatestCommit: str = 'com.atproto.sync.getLatestCommit'
-    ComAtprotoSyncGetRecord: str = 'com.atproto.sync.getRecord'
-    ComAtprotoSyncGetRepo: str = 'com.atproto.sync.getRepo'
-    ComAtprotoSyncListBlobs: str = 'com.atproto.sync.listBlobs'
-    ComAtprotoSyncListRepos: str = 'com.atproto.sync.listRepos'
-    ComAtprotoSyncNotifyOfUpdate: str = 'com.atproto.sync.notifyOfUpdate'
-    ComAtprotoSyncRequestCrawl: str = 'com.atproto.sync.requestCrawl'
-    ComAtprotoSyncSubscribeRepos: str = 'com.atproto.sync.subscribeRepos'
-    ComAtprotoTempFetchLabels: str = 'com.atproto.temp.fetchLabels'
-    ComAtprotoTempImportRepo: str = 'com.atproto.temp.importRepo'
-    ComAtprotoTempPushBlob: str = 'com.atproto.temp.pushBlob'
-    ComAtprotoTempTransferAccount: str = 'com.atproto.temp.transferAccount'
-
-
-ids = _Ids()
-load_models()
diff --git a/docs/Makefile b/docs/Makefile
index d55a1498..6eb1682d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
 SPHINXOPTS ?=
 SPHINXBUILD ?= sphinx-build
 SPHINXGENERATE ?= sphinx-apidoc
-MODULEPATH = ../atproto
+MODULEPATH = ../packages
 SOURCEDIR = source
 GENDIR = source/atproto
 BUILDDIR = build
diff --git a/docs/fix_title_of_models.py b/docs/fix_title_of_models.py
index 496a7eb8..f73ed4c2 100644
--- a/docs/fix_title_of_models.py
+++ b/docs/fix_title_of_models.py
@@ -5,11 +5,11 @@
 def main(path: Path) -> None:
     for root, _, files in os.walk(path):
         for file in files:
-            if file.startswith('atproto.xrpc_client.models.'):
+            if file.startswith('atproto_client.models.'):
                 file_path = os.path.join(root, file)
                 with open(file_path, 'r', encoding='UTF-8') as f:
                     content = f.read()
-                    content = content.replace('atproto.xrpc\\_client.models.', '')
+                    content = content.replace('atproto\\_client.models.', '')
                 with open(file_path, 'w', encoding='UTF-8') as f:
                     f.write(content)
                 print('Fix', file)
diff --git a/docs/gen_aliases_db.py b/docs/gen_aliases_db.py
index 60cae48c..483715b7 100644
--- a/docs/gen_aliases_db.py
+++ b/docs/gen_aliases_db.py
@@ -24,7 +24,7 @@ def main(init_path: Path, output_path: Path) -> None:
 
 
 if __name__ == '__main__':
-    models_init_path = Path(__file__).absolute().parent.parent.joinpath('atproto/xrpc_client/models/__init__.py')
+    models_init_path = Path(__file__).absolute().parent.parent.joinpath('packages/atproto_client/models/__init__.py')
     aliases_db_path = Path(__file__).absolute().parent.joinpath('source/aliases_db.py')
 
     main(models_init_path, aliases_db_path)
diff --git a/docs/source/aliases_db.py b/docs/source/aliases_db.py
index fbb019fb..0bef239a 100644
--- a/docs/source/aliases_db.py
+++ b/docs/source/aliases_db.py
@@ -1,140 +1,140 @@
 ALIASES_DB = {
-    'models.AppBskyActorDefs': 'atproto.xrpc_client.models.app.bsky.actor.defs',
-    'models.AppBskyActorGetPreferences': 'atproto.xrpc_client.models.app.bsky.actor.get_preferences',
-    'models.AppBskyActorGetProfile': 'atproto.xrpc_client.models.app.bsky.actor.get_profile',
-    'models.AppBskyActorGetProfiles': 'atproto.xrpc_client.models.app.bsky.actor.get_profiles',
-    'models.AppBskyActorGetSuggestions': 'atproto.xrpc_client.models.app.bsky.actor.get_suggestions',
-    'models.AppBskyActorProfile': 'atproto.xrpc_client.models.app.bsky.actor.profile',
-    'models.AppBskyActorPutPreferences': 'atproto.xrpc_client.models.app.bsky.actor.put_preferences',
-    'models.AppBskyActorSearchActors': 'atproto.xrpc_client.models.app.bsky.actor.search_actors',
-    'models.AppBskyActorSearchActorsTypeahead': 'atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead',
-    'models.AppBskyEmbedExternal': 'atproto.xrpc_client.models.app.bsky.embed.external',
-    'models.AppBskyEmbedImages': 'atproto.xrpc_client.models.app.bsky.embed.images',
-    'models.AppBskyEmbedRecord': 'atproto.xrpc_client.models.app.bsky.embed.record',
-    'models.AppBskyEmbedRecordWithMedia': 'atproto.xrpc_client.models.app.bsky.embed.record_with_media',
-    'models.AppBskyFeedDefs': 'atproto.xrpc_client.models.app.bsky.feed.defs',
-    'models.AppBskyFeedDescribeFeedGenerator': 'atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator',
-    'models.AppBskyFeedGenerator': 'atproto.xrpc_client.models.app.bsky.feed.generator',
-    'models.AppBskyFeedGetActorFeeds': 'atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds',
-    'models.AppBskyFeedGetActorLikes': 'atproto.xrpc_client.models.app.bsky.feed.get_actor_likes',
-    'models.AppBskyFeedGetAuthorFeed': 'atproto.xrpc_client.models.app.bsky.feed.get_author_feed',
-    'models.AppBskyFeedGetFeed': 'atproto.xrpc_client.models.app.bsky.feed.get_feed',
-    'models.AppBskyFeedGetFeedGenerator': 'atproto.xrpc_client.models.app.bsky.feed.get_feed_generator',
-    'models.AppBskyFeedGetFeedGenerators': 'atproto.xrpc_client.models.app.bsky.feed.get_feed_generators',
-    'models.AppBskyFeedGetFeedSkeleton': 'atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton',
-    'models.AppBskyFeedGetLikes': 'atproto.xrpc_client.models.app.bsky.feed.get_likes',
-    'models.AppBskyFeedGetListFeed': 'atproto.xrpc_client.models.app.bsky.feed.get_list_feed',
-    'models.AppBskyFeedGetPostThread': 'atproto.xrpc_client.models.app.bsky.feed.get_post_thread',
-    'models.AppBskyFeedGetPosts': 'atproto.xrpc_client.models.app.bsky.feed.get_posts',
-    'models.AppBskyFeedGetRepostedBy': 'atproto.xrpc_client.models.app.bsky.feed.get_reposted_by',
-    'models.AppBskyFeedGetSuggestedFeeds': 'atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds',
-    'models.AppBskyFeedGetTimeline': 'atproto.xrpc_client.models.app.bsky.feed.get_timeline',
-    'models.AppBskyFeedLike': 'atproto.xrpc_client.models.app.bsky.feed.like',
-    'models.AppBskyFeedPost': 'atproto.xrpc_client.models.app.bsky.feed.post',
-    'models.AppBskyFeedRepost': 'atproto.xrpc_client.models.app.bsky.feed.repost',
-    'models.AppBskyFeedSearchPosts': 'atproto.xrpc_client.models.app.bsky.feed.search_posts',
-    'models.AppBskyFeedThreadgate': 'atproto.xrpc_client.models.app.bsky.feed.threadgate',
-    'models.AppBskyGraphBlock': 'atproto.xrpc_client.models.app.bsky.graph.block',
-    'models.AppBskyGraphDefs': 'atproto.xrpc_client.models.app.bsky.graph.defs',
-    'models.AppBskyGraphFollow': 'atproto.xrpc_client.models.app.bsky.graph.follow',
-    'models.AppBskyGraphGetBlocks': 'atproto.xrpc_client.models.app.bsky.graph.get_blocks',
-    'models.AppBskyGraphGetFollowers': 'atproto.xrpc_client.models.app.bsky.graph.get_followers',
-    'models.AppBskyGraphGetFollows': 'atproto.xrpc_client.models.app.bsky.graph.get_follows',
-    'models.AppBskyGraphGetList': 'atproto.xrpc_client.models.app.bsky.graph.get_list',
-    'models.AppBskyGraphGetListBlocks': 'atproto.xrpc_client.models.app.bsky.graph.get_list_blocks',
-    'models.AppBskyGraphGetListMutes': 'atproto.xrpc_client.models.app.bsky.graph.get_list_mutes',
-    'models.AppBskyGraphGetLists': 'atproto.xrpc_client.models.app.bsky.graph.get_lists',
-    'models.AppBskyGraphGetMutes': 'atproto.xrpc_client.models.app.bsky.graph.get_mutes',
-    'models.AppBskyGraphGetSuggestedFollowsByActor': 'atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor',
-    'models.AppBskyGraphList': 'atproto.xrpc_client.models.app.bsky.graph.list',
-    'models.AppBskyGraphListblock': 'atproto.xrpc_client.models.app.bsky.graph.listblock',
-    'models.AppBskyGraphListitem': 'atproto.xrpc_client.models.app.bsky.graph.listitem',
-    'models.AppBskyGraphMuteActor': 'atproto.xrpc_client.models.app.bsky.graph.mute_actor',
-    'models.AppBskyGraphMuteActorList': 'atproto.xrpc_client.models.app.bsky.graph.mute_actor_list',
-    'models.AppBskyGraphUnmuteActor': 'atproto.xrpc_client.models.app.bsky.graph.unmute_actor',
-    'models.AppBskyGraphUnmuteActorList': 'atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list',
-    'models.AppBskyNotificationGetUnreadCount': 'atproto.xrpc_client.models.app.bsky.notification.get_unread_count',
-    'models.AppBskyNotificationListNotifications': 'atproto.xrpc_client.models.app.bsky.notification.list_notifications',
-    'models.AppBskyNotificationRegisterPush': 'atproto.xrpc_client.models.app.bsky.notification.register_push',
-    'models.AppBskyNotificationUpdateSeen': 'atproto.xrpc_client.models.app.bsky.notification.update_seen',
-    'models.AppBskyRichtextFacet': 'atproto.xrpc_client.models.app.bsky.richtext.facet',
-    'models.AppBskyUnspeccedDefs': 'atproto.xrpc_client.models.app.bsky.unspecced.defs',
-    'models.AppBskyUnspeccedGetPopular': 'atproto.xrpc_client.models.app.bsky.unspecced.get_popular',
-    'models.AppBskyUnspeccedGetPopularFeedGenerators': 'atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators',
-    'models.AppBskyUnspeccedGetTimelineSkeleton': 'atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton',
-    'models.AppBskyUnspeccedSearchActorsSkeleton': 'atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton',
-    'models.AppBskyUnspeccedSearchPostsSkeleton': 'atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton',
-    'models.ComAtprotoAdminDefs': 'atproto.xrpc_client.models.com.atproto.admin.defs',
-    'models.ComAtprotoAdminDeleteAccount': 'atproto.xrpc_client.models.com.atproto.admin.delete_account',
-    'models.ComAtprotoAdminDisableAccountInvites': 'atproto.xrpc_client.models.com.atproto.admin.disable_account_invites',
-    'models.ComAtprotoAdminDisableInviteCodes': 'atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes',
-    'models.ComAtprotoAdminEmitModerationEvent': 'atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event',
-    'models.ComAtprotoAdminEnableAccountInvites': 'atproto.xrpc_client.models.com.atproto.admin.enable_account_invites',
-    'models.ComAtprotoAdminGetAccountInfo': 'atproto.xrpc_client.models.com.atproto.admin.get_account_info',
-    'models.ComAtprotoAdminGetInviteCodes': 'atproto.xrpc_client.models.com.atproto.admin.get_invite_codes',
-    'models.ComAtprotoAdminGetModerationEvent': 'atproto.xrpc_client.models.com.atproto.admin.get_moderation_event',
-    'models.ComAtprotoAdminGetRecord': 'atproto.xrpc_client.models.com.atproto.admin.get_record',
-    'models.ComAtprotoAdminGetRepo': 'atproto.xrpc_client.models.com.atproto.admin.get_repo',
-    'models.ComAtprotoAdminGetSubjectStatus': 'atproto.xrpc_client.models.com.atproto.admin.get_subject_status',
-    'models.ComAtprotoAdminQueryModerationEvents': 'atproto.xrpc_client.models.com.atproto.admin.query_moderation_events',
-    'models.ComAtprotoAdminQueryModerationStatuses': 'atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses',
-    'models.ComAtprotoAdminSearchRepos': 'atproto.xrpc_client.models.com.atproto.admin.search_repos',
-    'models.ComAtprotoAdminSendEmail': 'atproto.xrpc_client.models.com.atproto.admin.send_email',
-    'models.ComAtprotoAdminUpdateAccountEmail': 'atproto.xrpc_client.models.com.atproto.admin.update_account_email',
-    'models.ComAtprotoAdminUpdateAccountHandle': 'atproto.xrpc_client.models.com.atproto.admin.update_account_handle',
-    'models.ComAtprotoAdminUpdateSubjectStatus': 'atproto.xrpc_client.models.com.atproto.admin.update_subject_status',
-    'models.ComAtprotoIdentityResolveHandle': 'atproto.xrpc_client.models.com.atproto.identity.resolve_handle',
-    'models.ComAtprotoIdentityUpdateHandle': 'atproto.xrpc_client.models.com.atproto.identity.update_handle',
-    'models.ComAtprotoLabelDefs': 'atproto.xrpc_client.models.com.atproto.label.defs',
-    'models.ComAtprotoLabelQueryLabels': 'atproto.xrpc_client.models.com.atproto.label.query_labels',
-    'models.ComAtprotoLabelSubscribeLabels': 'atproto.xrpc_client.models.com.atproto.label.subscribe_labels',
-    'models.ComAtprotoModerationCreateReport': 'atproto.xrpc_client.models.com.atproto.moderation.create_report',
-    'models.ComAtprotoModerationDefs': 'atproto.xrpc_client.models.com.atproto.moderation.defs',
-    'models.ComAtprotoRepoApplyWrites': 'atproto.xrpc_client.models.com.atproto.repo.apply_writes',
-    'models.ComAtprotoRepoCreateRecord': 'atproto.xrpc_client.models.com.atproto.repo.create_record',
-    'models.ComAtprotoRepoDeleteRecord': 'atproto.xrpc_client.models.com.atproto.repo.delete_record',
-    'models.ComAtprotoRepoDescribeRepo': 'atproto.xrpc_client.models.com.atproto.repo.describe_repo',
-    'models.ComAtprotoRepoGetRecord': 'atproto.xrpc_client.models.com.atproto.repo.get_record',
-    'models.ComAtprotoRepoListRecords': 'atproto.xrpc_client.models.com.atproto.repo.list_records',
-    'models.ComAtprotoRepoPutRecord': 'atproto.xrpc_client.models.com.atproto.repo.put_record',
-    'models.ComAtprotoRepoStrongRef': 'atproto.xrpc_client.models.com.atproto.repo.strong_ref',
-    'models.ComAtprotoRepoUploadBlob': 'atproto.xrpc_client.models.com.atproto.repo.upload_blob',
-    'models.ComAtprotoServerConfirmEmail': 'atproto.xrpc_client.models.com.atproto.server.confirm_email',
-    'models.ComAtprotoServerCreateAccount': 'atproto.xrpc_client.models.com.atproto.server.create_account',
-    'models.ComAtprotoServerCreateAppPassword': 'atproto.xrpc_client.models.com.atproto.server.create_app_password',
-    'models.ComAtprotoServerCreateInviteCode': 'atproto.xrpc_client.models.com.atproto.server.create_invite_code',
-    'models.ComAtprotoServerCreateInviteCodes': 'atproto.xrpc_client.models.com.atproto.server.create_invite_codes',
-    'models.ComAtprotoServerCreateSession': 'atproto.xrpc_client.models.com.atproto.server.create_session',
-    'models.ComAtprotoServerDefs': 'atproto.xrpc_client.models.com.atproto.server.defs',
-    'models.ComAtprotoServerDeleteAccount': 'atproto.xrpc_client.models.com.atproto.server.delete_account',
-    'models.ComAtprotoServerDeleteSession': 'atproto.xrpc_client.models.com.atproto.server.delete_session',
-    'models.ComAtprotoServerDescribeServer': 'atproto.xrpc_client.models.com.atproto.server.describe_server',
-    'models.ComAtprotoServerGetAccountInviteCodes': 'atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes',
-    'models.ComAtprotoServerGetSession': 'atproto.xrpc_client.models.com.atproto.server.get_session',
-    'models.ComAtprotoServerListAppPasswords': 'atproto.xrpc_client.models.com.atproto.server.list_app_passwords',
-    'models.ComAtprotoServerRefreshSession': 'atproto.xrpc_client.models.com.atproto.server.refresh_session',
-    'models.ComAtprotoServerRequestAccountDelete': 'atproto.xrpc_client.models.com.atproto.server.request_account_delete',
-    'models.ComAtprotoServerRequestEmailConfirmation': 'atproto.xrpc_client.models.com.atproto.server.request_email_confirmation',
-    'models.ComAtprotoServerRequestEmailUpdate': 'atproto.xrpc_client.models.com.atproto.server.request_email_update',
-    'models.ComAtprotoServerRequestPasswordReset': 'atproto.xrpc_client.models.com.atproto.server.request_password_reset',
-    'models.ComAtprotoServerReserveSigningKey': 'atproto.xrpc_client.models.com.atproto.server.reserve_signing_key',
-    'models.ComAtprotoServerResetPassword': 'atproto.xrpc_client.models.com.atproto.server.reset_password',
-    'models.ComAtprotoServerRevokeAppPassword': 'atproto.xrpc_client.models.com.atproto.server.revoke_app_password',
-    'models.ComAtprotoServerUpdateEmail': 'atproto.xrpc_client.models.com.atproto.server.update_email',
-    'models.ComAtprotoSyncGetBlob': 'atproto.xrpc_client.models.com.atproto.sync.get_blob',
-    'models.ComAtprotoSyncGetBlocks': 'atproto.xrpc_client.models.com.atproto.sync.get_blocks',
-    'models.ComAtprotoSyncGetCheckout': 'atproto.xrpc_client.models.com.atproto.sync.get_checkout',
-    'models.ComAtprotoSyncGetHead': 'atproto.xrpc_client.models.com.atproto.sync.get_head',
-    'models.ComAtprotoSyncGetLatestCommit': 'atproto.xrpc_client.models.com.atproto.sync.get_latest_commit',
-    'models.ComAtprotoSyncGetRecord': 'atproto.xrpc_client.models.com.atproto.sync.get_record',
-    'models.ComAtprotoSyncGetRepo': 'atproto.xrpc_client.models.com.atproto.sync.get_repo',
-    'models.ComAtprotoSyncListBlobs': 'atproto.xrpc_client.models.com.atproto.sync.list_blobs',
-    'models.ComAtprotoSyncListRepos': 'atproto.xrpc_client.models.com.atproto.sync.list_repos',
-    'models.ComAtprotoSyncNotifyOfUpdate': 'atproto.xrpc_client.models.com.atproto.sync.notify_of_update',
-    'models.ComAtprotoSyncRequestCrawl': 'atproto.xrpc_client.models.com.atproto.sync.request_crawl',
-    'models.ComAtprotoSyncSubscribeRepos': 'atproto.xrpc_client.models.com.atproto.sync.subscribe_repos',
-    'models.ComAtprotoTempFetchLabels': 'atproto.xrpc_client.models.com.atproto.temp.fetch_labels',
-    'models.ComAtprotoTempImportRepo': 'atproto.xrpc_client.models.com.atproto.temp.import_repo',
-    'models.ComAtprotoTempPushBlob': 'atproto.xrpc_client.models.com.atproto.temp.push_blob',
-    'models.ComAtprotoTempTransferAccount': 'atproto.xrpc_client.models.com.atproto.temp.transfer_account',
+    'models.AppBskyActorDefs': 'atproto_client.models.app.bsky.actor.defs',
+    'models.AppBskyActorGetPreferences': 'atproto_client.models.app.bsky.actor.get_preferences',
+    'models.AppBskyActorGetProfile': 'atproto_client.models.app.bsky.actor.get_profile',
+    'models.AppBskyActorGetProfiles': 'atproto_client.models.app.bsky.actor.get_profiles',
+    'models.AppBskyActorGetSuggestions': 'atproto_client.models.app.bsky.actor.get_suggestions',
+    'models.AppBskyActorProfile': 'atproto_client.models.app.bsky.actor.profile',
+    'models.AppBskyActorPutPreferences': 'atproto_client.models.app.bsky.actor.put_preferences',
+    'models.AppBskyActorSearchActors': 'atproto_client.models.app.bsky.actor.search_actors',
+    'models.AppBskyActorSearchActorsTypeahead': 'atproto_client.models.app.bsky.actor.search_actors_typeahead',
+    'models.AppBskyEmbedExternal': 'atproto_client.models.app.bsky.embed.external',
+    'models.AppBskyEmbedImages': 'atproto_client.models.app.bsky.embed.images',
+    'models.AppBskyEmbedRecord': 'atproto_client.models.app.bsky.embed.record',
+    'models.AppBskyEmbedRecordWithMedia': 'atproto_client.models.app.bsky.embed.record_with_media',
+    'models.AppBskyFeedDefs': 'atproto_client.models.app.bsky.feed.defs',
+    'models.AppBskyFeedDescribeFeedGenerator': 'atproto_client.models.app.bsky.feed.describe_feed_generator',
+    'models.AppBskyFeedGenerator': 'atproto_client.models.app.bsky.feed.generator',
+    'models.AppBskyFeedGetActorFeeds': 'atproto_client.models.app.bsky.feed.get_actor_feeds',
+    'models.AppBskyFeedGetActorLikes': 'atproto_client.models.app.bsky.feed.get_actor_likes',
+    'models.AppBskyFeedGetAuthorFeed': 'atproto_client.models.app.bsky.feed.get_author_feed',
+    'models.AppBskyFeedGetFeed': 'atproto_client.models.app.bsky.feed.get_feed',
+    'models.AppBskyFeedGetFeedGenerator': 'atproto_client.models.app.bsky.feed.get_feed_generator',
+    'models.AppBskyFeedGetFeedGenerators': 'atproto_client.models.app.bsky.feed.get_feed_generators',
+    'models.AppBskyFeedGetFeedSkeleton': 'atproto_client.models.app.bsky.feed.get_feed_skeleton',
+    'models.AppBskyFeedGetLikes': 'atproto_client.models.app.bsky.feed.get_likes',
+    'models.AppBskyFeedGetListFeed': 'atproto_client.models.app.bsky.feed.get_list_feed',
+    'models.AppBskyFeedGetPostThread': 'atproto_client.models.app.bsky.feed.get_post_thread',
+    'models.AppBskyFeedGetPosts': 'atproto_client.models.app.bsky.feed.get_posts',
+    'models.AppBskyFeedGetRepostedBy': 'atproto_client.models.app.bsky.feed.get_reposted_by',
+    'models.AppBskyFeedGetSuggestedFeeds': 'atproto_client.models.app.bsky.feed.get_suggested_feeds',
+    'models.AppBskyFeedGetTimeline': 'atproto_client.models.app.bsky.feed.get_timeline',
+    'models.AppBskyFeedLike': 'atproto_client.models.app.bsky.feed.like',
+    'models.AppBskyFeedPost': 'atproto_client.models.app.bsky.feed.post',
+    'models.AppBskyFeedRepost': 'atproto_client.models.app.bsky.feed.repost',
+    'models.AppBskyFeedSearchPosts': 'atproto_client.models.app.bsky.feed.search_posts',
+    'models.AppBskyFeedThreadgate': 'atproto_client.models.app.bsky.feed.threadgate',
+    'models.AppBskyGraphBlock': 'atproto_client.models.app.bsky.graph.block',
+    'models.AppBskyGraphDefs': 'atproto_client.models.app.bsky.graph.defs',
+    'models.AppBskyGraphFollow': 'atproto_client.models.app.bsky.graph.follow',
+    'models.AppBskyGraphGetBlocks': 'atproto_client.models.app.bsky.graph.get_blocks',
+    'models.AppBskyGraphGetFollowers': 'atproto_client.models.app.bsky.graph.get_followers',
+    'models.AppBskyGraphGetFollows': 'atproto_client.models.app.bsky.graph.get_follows',
+    'models.AppBskyGraphGetList': 'atproto_client.models.app.bsky.graph.get_list',
+    'models.AppBskyGraphGetListBlocks': 'atproto_client.models.app.bsky.graph.get_list_blocks',
+    'models.AppBskyGraphGetListMutes': 'atproto_client.models.app.bsky.graph.get_list_mutes',
+    'models.AppBskyGraphGetLists': 'atproto_client.models.app.bsky.graph.get_lists',
+    'models.AppBskyGraphGetMutes': 'atproto_client.models.app.bsky.graph.get_mutes',
+    'models.AppBskyGraphGetSuggestedFollowsByActor': 'atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor',
+    'models.AppBskyGraphList': 'atproto_client.models.app.bsky.graph.list',
+    'models.AppBskyGraphListblock': 'atproto_client.models.app.bsky.graph.listblock',
+    'models.AppBskyGraphListitem': 'atproto_client.models.app.bsky.graph.listitem',
+    'models.AppBskyGraphMuteActor': 'atproto_client.models.app.bsky.graph.mute_actor',
+    'models.AppBskyGraphMuteActorList': 'atproto_client.models.app.bsky.graph.mute_actor_list',
+    'models.AppBskyGraphUnmuteActor': 'atproto_client.models.app.bsky.graph.unmute_actor',
+    'models.AppBskyGraphUnmuteActorList': 'atproto_client.models.app.bsky.graph.unmute_actor_list',
+    'models.AppBskyNotificationGetUnreadCount': 'atproto_client.models.app.bsky.notification.get_unread_count',
+    'models.AppBskyNotificationListNotifications': 'atproto_client.models.app.bsky.notification.list_notifications',
+    'models.AppBskyNotificationRegisterPush': 'atproto_client.models.app.bsky.notification.register_push',
+    'models.AppBskyNotificationUpdateSeen': 'atproto_client.models.app.bsky.notification.update_seen',
+    'models.AppBskyRichtextFacet': 'atproto_client.models.app.bsky.richtext.facet',
+    'models.AppBskyUnspeccedDefs': 'atproto_client.models.app.bsky.unspecced.defs',
+    'models.AppBskyUnspeccedGetPopular': 'atproto_client.models.app.bsky.unspecced.get_popular',
+    'models.AppBskyUnspeccedGetPopularFeedGenerators': 'atproto_client.models.app.bsky.unspecced.get_popular_feed_generators',
+    'models.AppBskyUnspeccedGetTimelineSkeleton': 'atproto_client.models.app.bsky.unspecced.get_timeline_skeleton',
+    'models.AppBskyUnspeccedSearchActorsSkeleton': 'atproto_client.models.app.bsky.unspecced.search_actors_skeleton',
+    'models.AppBskyUnspeccedSearchPostsSkeleton': 'atproto_client.models.app.bsky.unspecced.search_posts_skeleton',
+    'models.ComAtprotoAdminDefs': 'atproto_client.models.com.atproto.admin.defs',
+    'models.ComAtprotoAdminDeleteAccount': 'atproto_client.models.com.atproto.admin.delete_account',
+    'models.ComAtprotoAdminDisableAccountInvites': 'atproto_client.models.com.atproto.admin.disable_account_invites',
+    'models.ComAtprotoAdminDisableInviteCodes': 'atproto_client.models.com.atproto.admin.disable_invite_codes',
+    'models.ComAtprotoAdminEmitModerationEvent': 'atproto_client.models.com.atproto.admin.emit_moderation_event',
+    'models.ComAtprotoAdminEnableAccountInvites': 'atproto_client.models.com.atproto.admin.enable_account_invites',
+    'models.ComAtprotoAdminGetAccountInfo': 'atproto_client.models.com.atproto.admin.get_account_info',
+    'models.ComAtprotoAdminGetInviteCodes': 'atproto_client.models.com.atproto.admin.get_invite_codes',
+    'models.ComAtprotoAdminGetModerationEvent': 'atproto_client.models.com.atproto.admin.get_moderation_event',
+    'models.ComAtprotoAdminGetRecord': 'atproto_client.models.com.atproto.admin.get_record',
+    'models.ComAtprotoAdminGetRepo': 'atproto_client.models.com.atproto.admin.get_repo',
+    'models.ComAtprotoAdminGetSubjectStatus': 'atproto_client.models.com.atproto.admin.get_subject_status',
+    'models.ComAtprotoAdminQueryModerationEvents': 'atproto_client.models.com.atproto.admin.query_moderation_events',
+    'models.ComAtprotoAdminQueryModerationStatuses': 'atproto_client.models.com.atproto.admin.query_moderation_statuses',
+    'models.ComAtprotoAdminSearchRepos': 'atproto_client.models.com.atproto.admin.search_repos',
+    'models.ComAtprotoAdminSendEmail': 'atproto_client.models.com.atproto.admin.send_email',
+    'models.ComAtprotoAdminUpdateAccountEmail': 'atproto_client.models.com.atproto.admin.update_account_email',
+    'models.ComAtprotoAdminUpdateAccountHandle': 'atproto_client.models.com.atproto.admin.update_account_handle',
+    'models.ComAtprotoAdminUpdateSubjectStatus': 'atproto_client.models.com.atproto.admin.update_subject_status',
+    'models.ComAtprotoIdentityResolveHandle': 'atproto_client.models.com.atproto.identity.resolve_handle',
+    'models.ComAtprotoIdentityUpdateHandle': 'atproto_client.models.com.atproto.identity.update_handle',
+    'models.ComAtprotoLabelDefs': 'atproto_client.models.com.atproto.label.defs',
+    'models.ComAtprotoLabelQueryLabels': 'atproto_client.models.com.atproto.label.query_labels',
+    'models.ComAtprotoLabelSubscribeLabels': 'atproto_client.models.com.atproto.label.subscribe_labels',
+    'models.ComAtprotoModerationCreateReport': 'atproto_client.models.com.atproto.moderation.create_report',
+    'models.ComAtprotoModerationDefs': 'atproto_client.models.com.atproto.moderation.defs',
+    'models.ComAtprotoRepoApplyWrites': 'atproto_client.models.com.atproto.repo.apply_writes',
+    'models.ComAtprotoRepoCreateRecord': 'atproto_client.models.com.atproto.repo.create_record',
+    'models.ComAtprotoRepoDeleteRecord': 'atproto_client.models.com.atproto.repo.delete_record',
+    'models.ComAtprotoRepoDescribeRepo': 'atproto_client.models.com.atproto.repo.describe_repo',
+    'models.ComAtprotoRepoGetRecord': 'atproto_client.models.com.atproto.repo.get_record',
+    'models.ComAtprotoRepoListRecords': 'atproto_client.models.com.atproto.repo.list_records',
+    'models.ComAtprotoRepoPutRecord': 'atproto_client.models.com.atproto.repo.put_record',
+    'models.ComAtprotoRepoStrongRef': 'atproto_client.models.com.atproto.repo.strong_ref',
+    'models.ComAtprotoRepoUploadBlob': 'atproto_client.models.com.atproto.repo.upload_blob',
+    'models.ComAtprotoServerConfirmEmail': 'atproto_client.models.com.atproto.server.confirm_email',
+    'models.ComAtprotoServerCreateAccount': 'atproto_client.models.com.atproto.server.create_account',
+    'models.ComAtprotoServerCreateAppPassword': 'atproto_client.models.com.atproto.server.create_app_password',
+    'models.ComAtprotoServerCreateInviteCode': 'atproto_client.models.com.atproto.server.create_invite_code',
+    'models.ComAtprotoServerCreateInviteCodes': 'atproto_client.models.com.atproto.server.create_invite_codes',
+    'models.ComAtprotoServerCreateSession': 'atproto_client.models.com.atproto.server.create_session',
+    'models.ComAtprotoServerDefs': 'atproto_client.models.com.atproto.server.defs',
+    'models.ComAtprotoServerDeleteAccount': 'atproto_client.models.com.atproto.server.delete_account',
+    'models.ComAtprotoServerDeleteSession': 'atproto_client.models.com.atproto.server.delete_session',
+    'models.ComAtprotoServerDescribeServer': 'atproto_client.models.com.atproto.server.describe_server',
+    'models.ComAtprotoServerGetAccountInviteCodes': 'atproto_client.models.com.atproto.server.get_account_invite_codes',
+    'models.ComAtprotoServerGetSession': 'atproto_client.models.com.atproto.server.get_session',
+    'models.ComAtprotoServerListAppPasswords': 'atproto_client.models.com.atproto.server.list_app_passwords',
+    'models.ComAtprotoServerRefreshSession': 'atproto_client.models.com.atproto.server.refresh_session',
+    'models.ComAtprotoServerRequestAccountDelete': 'atproto_client.models.com.atproto.server.request_account_delete',
+    'models.ComAtprotoServerRequestEmailConfirmation': 'atproto_client.models.com.atproto.server.request_email_confirmation',
+    'models.ComAtprotoServerRequestEmailUpdate': 'atproto_client.models.com.atproto.server.request_email_update',
+    'models.ComAtprotoServerRequestPasswordReset': 'atproto_client.models.com.atproto.server.request_password_reset',
+    'models.ComAtprotoServerReserveSigningKey': 'atproto_client.models.com.atproto.server.reserve_signing_key',
+    'models.ComAtprotoServerResetPassword': 'atproto_client.models.com.atproto.server.reset_password',
+    'models.ComAtprotoServerRevokeAppPassword': 'atproto_client.models.com.atproto.server.revoke_app_password',
+    'models.ComAtprotoServerUpdateEmail': 'atproto_client.models.com.atproto.server.update_email',
+    'models.ComAtprotoSyncGetBlob': 'atproto_client.models.com.atproto.sync.get_blob',
+    'models.ComAtprotoSyncGetBlocks': 'atproto_client.models.com.atproto.sync.get_blocks',
+    'models.ComAtprotoSyncGetCheckout': 'atproto_client.models.com.atproto.sync.get_checkout',
+    'models.ComAtprotoSyncGetHead': 'atproto_client.models.com.atproto.sync.get_head',
+    'models.ComAtprotoSyncGetLatestCommit': 'atproto_client.models.com.atproto.sync.get_latest_commit',
+    'models.ComAtprotoSyncGetRecord': 'atproto_client.models.com.atproto.sync.get_record',
+    'models.ComAtprotoSyncGetRepo': 'atproto_client.models.com.atproto.sync.get_repo',
+    'models.ComAtprotoSyncListBlobs': 'atproto_client.models.com.atproto.sync.list_blobs',
+    'models.ComAtprotoSyncListRepos': 'atproto_client.models.com.atproto.sync.list_repos',
+    'models.ComAtprotoSyncNotifyOfUpdate': 'atproto_client.models.com.atproto.sync.notify_of_update',
+    'models.ComAtprotoSyncRequestCrawl': 'atproto_client.models.com.atproto.sync.request_crawl',
+    'models.ComAtprotoSyncSubscribeRepos': 'atproto_client.models.com.atproto.sync.subscribe_repos',
+    'models.ComAtprotoTempFetchLabels': 'atproto_client.models.com.atproto.temp.fetch_labels',
+    'models.ComAtprotoTempImportRepo': 'atproto_client.models.com.atproto.temp.import_repo',
+    'models.ComAtprotoTempPushBlob': 'atproto_client.models.com.atproto.temp.push_blob',
+    'models.ComAtprotoTempTransferAccount': 'atproto_client.models.com.atproto.temp.transfer_account',
 }
diff --git a/docs/source/atproto/atproto.car.rst b/docs/source/atproto/atproto.car.rst
deleted file mode 100644
index cdca2c5f..00000000
--- a/docs/source/atproto/atproto.car.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.car
-===========
-
-.. automodule:: atproto.car
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.cbor.rst b/docs/source/atproto/atproto.cbor.rst
deleted file mode 100644
index 402ab416..00000000
--- a/docs/source/atproto/atproto.cbor.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.cbor
-============
-
-.. automodule:: atproto.cbor
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.cid.rst b/docs/source/atproto/atproto.cid.rst
deleted file mode 100644
index 244bf2b8..00000000
--- a/docs/source/atproto/atproto.cid.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.cid
-===========
-
-.. automodule:: atproto.cid
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.cli.rst b/docs/source/atproto/atproto.cli.rst
deleted file mode 100644
index 77210f11..00000000
--- a/docs/source/atproto/atproto.cli.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.cli
-===========
-
-.. automodule:: atproto.cli
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.codegen.clients.generate_async_client.rst b/docs/source/atproto/atproto.codegen.clients.generate_async_client.rst
deleted file mode 100644
index 6ee0fe96..00000000
--- a/docs/source/atproto/atproto.codegen.clients.generate_async_client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.codegen.clients.generate\_async\_client
-===============================================
-
-.. automodule:: atproto.codegen.clients.generate_async_client
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.models.builder.rst b/docs/source/atproto/atproto.codegen.models.builder.rst
deleted file mode 100644
index de9f2f5e..00000000
--- a/docs/source/atproto/atproto.codegen.models.builder.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.codegen.models.builder
-==============================
-
-.. automodule:: atproto.codegen.models.builder
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.models.generator.rst b/docs/source/atproto/atproto.codegen.models.generator.rst
deleted file mode 100644
index dc53ef4b..00000000
--- a/docs/source/atproto/atproto.codegen.models.generator.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.codegen.models.generator
-================================
-
-.. automodule:: atproto.codegen.models.generator
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.models.rst b/docs/source/atproto/atproto.codegen.models.rst
deleted file mode 100644
index 17fb9166..00000000
--- a/docs/source/atproto/atproto.codegen.models.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-atproto.codegen.models
-======================
-
-.. automodule:: atproto.codegen.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.codegen.models.builder
-   atproto.codegen.models.generator
diff --git a/docs/source/atproto/atproto.codegen.namespaces.builder.rst b/docs/source/atproto/atproto.codegen.namespaces.builder.rst
deleted file mode 100644
index d88f2681..00000000
--- a/docs/source/atproto/atproto.codegen.namespaces.builder.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.codegen.namespaces.builder
-==================================
-
-.. automodule:: atproto.codegen.namespaces.builder
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.namespaces.rst b/docs/source/atproto/atproto.codegen.namespaces.rst
deleted file mode 100644
index c1ae14f1..00000000
--- a/docs/source/atproto/atproto.codegen.namespaces.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-atproto.codegen.namespaces
-==========================
-
-.. automodule:: atproto.codegen.namespaces
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.codegen.namespaces.builder
-   atproto.codegen.namespaces.generator
diff --git a/docs/source/atproto/atproto.codegen.rst b/docs/source/atproto/atproto.codegen.rst
deleted file mode 100644
index a53c5ea6..00000000
--- a/docs/source/atproto/atproto.codegen.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-atproto.codegen
-===============
-
-.. automodule:: atproto.codegen
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.codegen.clients
-   atproto.codegen.models
-   atproto.codegen.namespaces
diff --git a/docs/source/atproto/atproto.firehose.rst b/docs/source/atproto/atproto.firehose.rst
deleted file mode 100644
index 53cc04c0..00000000
--- a/docs/source/atproto/atproto.firehose.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-atproto.firehose
-================
-
-.. automodule:: atproto.firehose
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.firehose.client
-   atproto.firehose.models
diff --git a/docs/source/atproto/atproto.lexicon.models.rst b/docs/source/atproto/atproto.lexicon.models.rst
deleted file mode 100644
index d6ead7ce..00000000
--- a/docs/source/atproto/atproto.lexicon.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.lexicon.models
-======================
-
-.. automodule:: atproto.lexicon.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.lexicon.rst b/docs/source/atproto/atproto.lexicon.rst
deleted file mode 100644
index 3e29d45a..00000000
--- a/docs/source/atproto/atproto.lexicon.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-atproto.lexicon
-===============
-
-.. automodule:: atproto.lexicon
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.lexicon.models
-   atproto.lexicon.parser
diff --git a/docs/source/atproto/atproto.nsid.rst b/docs/source/atproto/atproto.nsid.rst
deleted file mode 100644
index 873f2cf6..00000000
--- a/docs/source/atproto/atproto.nsid.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.nsid
-============
-
-.. automodule:: atproto.nsid
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.rst b/docs/source/atproto/atproto.rst
index 8e8628dd..0f7a003a 100644
--- a/docs/source/atproto/atproto.rst
+++ b/docs/source/atproto/atproto.rst
@@ -6,25 +6,6 @@ atproto
    :undoc-members:
    :show-inheritance:
 
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.car
-   atproto.cbor
-   atproto.cid
-   atproto.cli
-   atproto.codegen
-   atproto.firehose
-   atproto.lexicon
-   atproto.nsid
-   atproto.uri
-   atproto.utils
-   atproto.xrpc_client
-   atproto.xrpc_server
-
 Submodules
 ----------
 
diff --git a/docs/source/atproto/atproto.uri.rst b/docs/source/atproto/atproto.uri.rst
deleted file mode 100644
index 628d0e98..00000000
--- a/docs/source/atproto/atproto.uri.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.uri
-===========
-
-.. automodule:: atproto.uri
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto.xrpc_client.client.async_client.rst b/docs/source/atproto/atproto.xrpc_client.client.async_client.rst
deleted file mode 100644
index 165d9a6c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.async_client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.client.async\_client
-=========================================
-
-.. automodule:: atproto.xrpc_client.client.async_client
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.async_raw.rst b/docs/source/atproto/atproto.xrpc_client.client.async_raw.rst
deleted file mode 100644
index e51a0a55..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.async_raw.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.client.async\_raw
-======================================
-
-.. automodule:: atproto.xrpc_client.client.async_raw
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.client.rst b/docs/source/atproto/atproto.xrpc_client.client.client.rst
deleted file mode 100644
index 9c1d8916..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.client.client
-==================================
-
-.. automodule:: atproto.xrpc_client.client.client
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.rst b/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.rst
deleted file mode 100644
index 2221d6d7..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-atproto.xrpc\_client.client.methods\_mixin
-==========================================
-
-.. automodule:: atproto.xrpc_client.client.methods_mixin
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.client.methods_mixin.session
-   atproto.xrpc_client.client.methods_mixin.time
diff --git a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.session.rst b/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.session.rst
deleted file mode 100644
index 302c908e..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.client.methods\_mixin.session
-==================================================
-
-.. automodule:: atproto.xrpc_client.client.methods_mixin.session
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.time.rst b/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.time.rst
deleted file mode 100644
index c94a7d7f..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.methods_mixin.time.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.client.methods\_mixin.time
-===============================================
-
-.. automodule:: atproto.xrpc_client.client.methods_mixin.time
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.rst b/docs/source/atproto/atproto.xrpc_client.client.rst
deleted file mode 100644
index 44b8e18d..00000000
--- a/docs/source/atproto/atproto.xrpc_client.client.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-atproto.xrpc\_client.client
-===========================
-
-.. automodule:: atproto.xrpc_client.client
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.client.methods_mixin
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.client.async_client
-   atproto.xrpc_client.client.async_raw
-   atproto.xrpc_client.client.auth
-   atproto.xrpc_client.client.base
-   atproto.xrpc_client.client.client
-   atproto.xrpc_client.client.raw
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.rst
deleted file mode 100644
index 49c0c429..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-app.bsky.actor
-==========================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.actor.defs
-   atproto.xrpc_client.models.app.bsky.actor.get_preferences
-   atproto.xrpc_client.models.app.bsky.actor.get_profile
-   atproto.xrpc_client.models.app.bsky.actor.get_profiles
-   atproto.xrpc_client.models.app.bsky.actor.get_suggestions
-   atproto.xrpc_client.models.app.bsky.actor.profile
-   atproto.xrpc_client.models.app.bsky.actor.put_preferences
-   atproto.xrpc_client.models.app.bsky.actor.search_actors
-   atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead.rst
deleted file mode 100644
index 698dc12d..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.actor.search\_actors\_typeahead
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.search_actors_typeahead
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.rst
deleted file mode 100644
index aee4bbfb..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-app.bsky.embed
-==========================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.embed
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.embed.external
-   atproto.xrpc_client.models.app.bsky.embed.images
-   atproto.xrpc_client.models.app.bsky.embed.record
-   atproto.xrpc_client.models.app.bsky.embed.record_with_media
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator.rst
deleted file mode 100644
index 9b1aa5d1..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.feed.describe\_feed\_generator
-===================================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_likes.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_likes.rst
deleted file mode 100644
index 206e08ce..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_likes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.feed.get\_actor\_likes
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_actor_likes
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_author_feed.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_author_feed.rst
deleted file mode 100644
index 31e2618b..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_author_feed.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.feed.get\_author\_feed
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_author_feed
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_post_thread.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_post_thread.rst
deleted file mode 100644
index dd467223..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_post_thread.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.feed.get\_post\_thread
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_post_thread
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_reposted_by.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_reposted_by.rst
deleted file mode 100644
index c93c3eb9..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_reposted_by.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.feed.get\_reposted\_by
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_reposted_by
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.rst
deleted file mode 100644
index 541bc861..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-app.bsky.feed
-=========================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.feed.defs
-   atproto.xrpc_client.models.app.bsky.feed.describe_feed_generator
-   atproto.xrpc_client.models.app.bsky.feed.generator
-   atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds
-   atproto.xrpc_client.models.app.bsky.feed.get_actor_likes
-   atproto.xrpc_client.models.app.bsky.feed.get_author_feed
-   atproto.xrpc_client.models.app.bsky.feed.get_feed
-   atproto.xrpc_client.models.app.bsky.feed.get_feed_generator
-   atproto.xrpc_client.models.app.bsky.feed.get_feed_generators
-   atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton
-   atproto.xrpc_client.models.app.bsky.feed.get_likes
-   atproto.xrpc_client.models.app.bsky.feed.get_list_feed
-   atproto.xrpc_client.models.app.bsky.feed.get_post_thread
-   atproto.xrpc_client.models.app.bsky.feed.get_posts
-   atproto.xrpc_client.models.app.bsky.feed.get_reposted_by
-   atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds
-   atproto.xrpc_client.models.app.bsky.feed.get_timeline
-   atproto.xrpc_client.models.app.bsky.feed.like
-   atproto.xrpc_client.models.app.bsky.feed.post
-   atproto.xrpc_client.models.app.bsky.feed.repost
-   atproto.xrpc_client.models.app.bsky.feed.search_posts
-   atproto.xrpc_client.models.app.bsky.feed.threadgate
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_follows.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_follows.rst
deleted file mode 100644
index 61202d6d..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_follows.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.graph.get\_follows
-=======================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_follows
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_mutes.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_mutes.rst
deleted file mode 100644
index 9384d11c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_mutes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.graph.get\_list\_mutes
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_list_mutes
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listblock.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listblock.rst
deleted file mode 100644
index 87f12403..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listblock.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.graph.listblock
-====================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.listblock
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor_list.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor_list.rst
deleted file mode 100644
index 49133327..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor_list.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.graph.mute\_actor\_list
-============================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.mute_actor_list
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.rst
deleted file mode 100644
index 654387a5..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-app.bsky.graph
-==========================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.graph.block
-   atproto.xrpc_client.models.app.bsky.graph.defs
-   atproto.xrpc_client.models.app.bsky.graph.follow
-   atproto.xrpc_client.models.app.bsky.graph.get_blocks
-   atproto.xrpc_client.models.app.bsky.graph.get_followers
-   atproto.xrpc_client.models.app.bsky.graph.get_follows
-   atproto.xrpc_client.models.app.bsky.graph.get_list
-   atproto.xrpc_client.models.app.bsky.graph.get_list_blocks
-   atproto.xrpc_client.models.app.bsky.graph.get_list_mutes
-   atproto.xrpc_client.models.app.bsky.graph.get_lists
-   atproto.xrpc_client.models.app.bsky.graph.get_mutes
-   atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor
-   atproto.xrpc_client.models.app.bsky.graph.list
-   atproto.xrpc_client.models.app.bsky.graph.listblock
-   atproto.xrpc_client.models.app.bsky.graph.listitem
-   atproto.xrpc_client.models.app.bsky.graph.mute_actor
-   atproto.xrpc_client.models.app.bsky.graph.mute_actor_list
-   atproto.xrpc_client.models.app.bsky.graph.unmute_actor
-   atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.get_unread_count.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.get_unread_count.rst
deleted file mode 100644
index 84142870..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.get_unread_count.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.notification.get\_unread\_count
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.notification.get_unread_count
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.register_push.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.register_push.rst
deleted file mode 100644
index 2c8c7922..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.register_push.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.notification.register\_push
-================================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.notification.register_push
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.rst
deleted file mode 100644
index 42ee9103..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-app.bsky.notification
-=================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.notification
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.notification.get_unread_count
-   atproto.xrpc_client.models.app.bsky.notification.list_notifications
-   atproto.xrpc_client.models.app.bsky.notification.register_push
-   atproto.xrpc_client.models.app.bsky.notification.update_seen
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.update_seen.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.update_seen.rst
deleted file mode 100644
index f278126c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.update_seen.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.notification.update\_seen
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.notification.update_seen
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.facet.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.facet.rst
deleted file mode 100644
index d9ff77f9..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.facet.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.richtext.facet
-===================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.richtext.facet
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.rst
deleted file mode 100644
index 0679f023..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.richtext.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-app.bsky.richtext
-=============================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.richtext
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.richtext.facet
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.rst
deleted file mode 100644
index 4fb01f76..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-app.bsky
-====================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.actor
-   atproto.xrpc_client.models.app.bsky.embed
-   atproto.xrpc_client.models.app.bsky.feed
-   atproto.xrpc_client.models.app.bsky.graph
-   atproto.xrpc_client.models.app.bsky.notification
-   atproto.xrpc_client.models.app.bsky.richtext
-   atproto.xrpc_client.models.app.bsky.unspecced
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.defs.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.defs.rst
deleted file mode 100644
index e2c9ccb9..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.defs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.unspecced.defs
-===================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.defs
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular.rst
deleted file mode 100644
index bbdb64a8..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-app.bsky.unspecced.get\_popular
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.get_popular
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.rst b/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.rst
deleted file mode 100644
index fa6d5c0c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-app.bsky.unspecced
-==============================================
-
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky.unspecced.defs
-   atproto.xrpc_client.models.app.bsky.unspecced.get_popular
-   atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators
-   atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton
-   atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton
-   atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.rst b/docs/source/atproto/atproto.xrpc_client.models.app.rst
deleted file mode 100644
index b3b9a62d..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.app.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-app
-===============================
-
-.. automodule:: atproto.xrpc_client.models.app
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app.bsky
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.delete_account.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.delete_account.rst
deleted file mode 100644
index 1dbefc8c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.delete_account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.delete\_account
-=============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.delete_account
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes.rst
deleted file mode 100644
index 5bb3c607..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.disable\_invite\_codes
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_account_info.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_account_info.rst
deleted file mode 100644
index 79b0e6e5..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_account_info.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.get\_account\_info
-================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_account_info
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_invite_codes.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_invite_codes.rst
deleted file mode 100644
index 1d55f26a..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_invite_codes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.get\_invite\_codes
-================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_invite_codes
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_moderation_event.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_moderation_event.rst
deleted file mode 100644
index 56258afa..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_moderation_event.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.get\_moderation\_event
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_moderation_event
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_repo.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_repo.rst
deleted file mode 100644
index 65f7eb66..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_repo.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.get\_repo
-=======================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_repo
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_subject_status.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_subject_status.rst
deleted file mode 100644
index 8c6c0229..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_subject_status.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.get\_subject\_status
-==================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_subject_status
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.rst
deleted file mode 100644
index fd6a4279..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-com.atproto.admin
-=============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.admin.defs
-   atproto.xrpc_client.models.com.atproto.admin.delete_account
-   atproto.xrpc_client.models.com.atproto.admin.disable_account_invites
-   atproto.xrpc_client.models.com.atproto.admin.disable_invite_codes
-   atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event
-   atproto.xrpc_client.models.com.atproto.admin.enable_account_invites
-   atproto.xrpc_client.models.com.atproto.admin.get_account_info
-   atproto.xrpc_client.models.com.atproto.admin.get_invite_codes
-   atproto.xrpc_client.models.com.atproto.admin.get_moderation_event
-   atproto.xrpc_client.models.com.atproto.admin.get_record
-   atproto.xrpc_client.models.com.atproto.admin.get_repo
-   atproto.xrpc_client.models.com.atproto.admin.get_subject_status
-   atproto.xrpc_client.models.com.atproto.admin.query_moderation_events
-   atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses
-   atproto.xrpc_client.models.com.atproto.admin.search_repos
-   atproto.xrpc_client.models.com.atproto.admin.send_email
-   atproto.xrpc_client.models.com.atproto.admin.update_account_email
-   atproto.xrpc_client.models.com.atproto.admin.update_account_handle
-   atproto.xrpc_client.models.com.atproto.admin.update_subject_status
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.search_repos.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.search_repos.rst
deleted file mode 100644
index a3053418..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.search_repos.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.search\_repos
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.search_repos
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.send_email.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.send_email.rst
deleted file mode 100644
index 7577f4c0..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.send_email.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.send\_email
-=========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.send_email
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_email.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_email.rst
deleted file mode 100644
index e0e35911..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_email.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.admin.update\_account\_email
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.update_account_email
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.resolve_handle.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.resolve_handle.rst
deleted file mode 100644
index c9ec5a06..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.resolve_handle.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.identity.resolve\_handle
-================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.identity.resolve_handle
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.rst
deleted file mode 100644
index dc611451..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-com.atproto.identity
-================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.identity
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.identity.resolve_handle
-   atproto.xrpc_client.models.com.atproto.identity.update_handle
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.query_labels.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.query_labels.rst
deleted file mode 100644
index c15ae8ec..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.query_labels.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.label.query\_labels
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.label.query_labels
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.rst
deleted file mode 100644
index 3830388e..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-com.atproto.label
-=============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.label
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.label.defs
-   atproto.xrpc_client.models.com.atproto.label.query_labels
-   atproto.xrpc_client.models.com.atproto.label.subscribe_labels
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.create_report.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.create_report.rst
deleted file mode 100644
index a9f82bb5..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.create_report.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.moderation.create\_report
-=================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.moderation.create_report
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.defs.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.defs.rst
deleted file mode 100644
index 1c602909..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.defs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.moderation.defs
-=======================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.moderation.defs
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.rst
deleted file mode 100644
index 25359293..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.moderation.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-com.atproto.moderation
-==================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.moderation
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.moderation.create_report
-   atproto.xrpc_client.models.com.atproto.moderation.defs
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.create_record.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.create_record.rst
deleted file mode 100644
index db7f14ef..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.create_record.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.create\_record
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.create_record
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.delete_record.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.delete_record.rst
deleted file mode 100644
index 5e7d8eb4..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.delete_record.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.delete\_record
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.delete_record
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.describe_repo.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.describe_repo.rst
deleted file mode 100644
index 1d29d4bf..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.describe_repo.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.describe\_repo
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.describe_repo
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.put_record.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.put_record.rst
deleted file mode 100644
index 7ee36896..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.put_record.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.put\_record
-========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.put_record
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.rst
deleted file mode 100644
index d04e2bcc..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-com.atproto.repo
-============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.repo.apply_writes
-   atproto.xrpc_client.models.com.atproto.repo.create_record
-   atproto.xrpc_client.models.com.atproto.repo.delete_record
-   atproto.xrpc_client.models.com.atproto.repo.describe_repo
-   atproto.xrpc_client.models.com.atproto.repo.get_record
-   atproto.xrpc_client.models.com.atproto.repo.list_records
-   atproto.xrpc_client.models.com.atproto.repo.put_record
-   atproto.xrpc_client.models.com.atproto.repo.strong_ref
-   atproto.xrpc_client.models.com.atproto.repo.upload_blob
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.strong_ref.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.strong_ref.rst
deleted file mode 100644
index db750cf9..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.strong_ref.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.strong\_ref
-========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.strong_ref
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.upload_blob.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.upload_blob.rst
deleted file mode 100644
index e8d5984b..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.upload_blob.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.repo.upload\_blob
-=========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.upload_blob
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.rst
deleted file mode 100644
index dcaf347f..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-com.atproto
-=======================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.admin
-   atproto.xrpc_client.models.com.atproto.identity
-   atproto.xrpc_client.models.com.atproto.label
-   atproto.xrpc_client.models.com.atproto.moderation
-   atproto.xrpc_client.models.com.atproto.repo
-   atproto.xrpc_client.models.com.atproto.server
-   atproto.xrpc_client.models.com.atproto.sync
-   atproto.xrpc_client.models.com.atproto.temp
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.confirm_email.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.confirm_email.rst
deleted file mode 100644
index d722ab2a..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.confirm_email.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.confirm\_email
-=============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.confirm_email
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_account.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_account.rst
deleted file mode 100644
index 742013c2..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.create\_account
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.create_account
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_app_password.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_app_password.rst
deleted file mode 100644
index dc706362..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_app_password.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.create\_app\_password
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.create_app_password
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_code.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_code.rst
deleted file mode 100644
index 31bbc775..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_code.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.create\_invite\_code
-===================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.create_invite_code
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_codes.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_codes.rst
deleted file mode 100644
index 1a6c724e..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_invite_codes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.create\_invite\_codes
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.create_invite_codes
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_session.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_session.rst
deleted file mode 100644
index eadc3433..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.create_session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.create\_session
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.create_session
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.defs.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.defs.rst
deleted file mode 100644
index 3b3f4ed3..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.defs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.defs
-===================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.defs
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_account.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_account.rst
deleted file mode 100644
index 6582ef5f..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.delete\_account
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.delete_account
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_session.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_session.rst
deleted file mode 100644
index c387c305..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.delete_session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.delete\_session
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.delete_session
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.describe_server.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.describe_server.rst
deleted file mode 100644
index 404fbc65..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.describe_server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.describe\_server
-===============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.describe_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_session.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_session.rst
deleted file mode 100644
index f19686d2..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.get\_session
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.get_session
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.list_app_passwords.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.list_app_passwords.rst
deleted file mode 100644
index fe5deaaf..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.list_app_passwords.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.list\_app\_passwords
-===================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.list_app_passwords
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.refresh_session.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.refresh_session.rst
deleted file mode 100644
index 3312fddb..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.refresh_session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.refresh\_session
-===============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.refresh_session
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reserve_signing_key.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reserve_signing_key.rst
deleted file mode 100644
index 8c356338..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reserve_signing_key.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.reserve\_signing\_key
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.reserve_signing_key
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reset_password.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reset_password.rst
deleted file mode 100644
index 092a2374..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.reset_password.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.reset\_password
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.reset_password
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.revoke_app_password.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.revoke_app_password.rst
deleted file mode 100644
index eba9dd5a..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.revoke_app_password.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.revoke\_app\_password
-====================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.revoke_app_password
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.rst
deleted file mode 100644
index 33655867..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-com.atproto.server
-==============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.server.confirm_email
-   atproto.xrpc_client.models.com.atproto.server.create_account
-   atproto.xrpc_client.models.com.atproto.server.create_app_password
-   atproto.xrpc_client.models.com.atproto.server.create_invite_code
-   atproto.xrpc_client.models.com.atproto.server.create_invite_codes
-   atproto.xrpc_client.models.com.atproto.server.create_session
-   atproto.xrpc_client.models.com.atproto.server.defs
-   atproto.xrpc_client.models.com.atproto.server.delete_account
-   atproto.xrpc_client.models.com.atproto.server.delete_session
-   atproto.xrpc_client.models.com.atproto.server.describe_server
-   atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes
-   atproto.xrpc_client.models.com.atproto.server.get_session
-   atproto.xrpc_client.models.com.atproto.server.list_app_passwords
-   atproto.xrpc_client.models.com.atproto.server.refresh_session
-   atproto.xrpc_client.models.com.atproto.server.request_account_delete
-   atproto.xrpc_client.models.com.atproto.server.request_email_confirmation
-   atproto.xrpc_client.models.com.atproto.server.request_email_update
-   atproto.xrpc_client.models.com.atproto.server.request_password_reset
-   atproto.xrpc_client.models.com.atproto.server.reserve_signing_key
-   atproto.xrpc_client.models.com.atproto.server.reset_password
-   atproto.xrpc_client.models.com.atproto.server.revoke_app_password
-   atproto.xrpc_client.models.com.atproto.server.update_email
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.update_email.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.update_email.rst
deleted file mode 100644
index 8d39354c..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.update_email.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.server.update\_email
-============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.update_email
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blocks.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blocks.rst
deleted file mode 100644
index 1c7812fe..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blocks.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.get\_blocks
-========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_blocks
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_latest_commit.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_latest_commit.rst
deleted file mode 100644
index 2c03ada6..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_latest_commit.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.get\_latest\_commit
-================================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_latest_commit
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_record.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_record.rst
deleted file mode 100644
index 4408643a..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_record.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.get\_record
-========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_record
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_blobs.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_blobs.rst
deleted file mode 100644
index 740ed1fd..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_blobs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.list\_blobs
-========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.list_blobs
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.notify_of_update.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.notify_of_update.rst
deleted file mode 100644
index a1e92225..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.notify_of_update.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.notify\_of\_update
-===============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.notify_of_update
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.request_crawl.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.request_crawl.rst
deleted file mode 100644
index ebc3a2fd..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.request_crawl.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.request\_crawl
-===========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.request_crawl
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.rst
deleted file mode 100644
index 733cd8ca..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-com.atproto.sync
-============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.sync.get_blob
-   atproto.xrpc_client.models.com.atproto.sync.get_blocks
-   atproto.xrpc_client.models.com.atproto.sync.get_checkout
-   atproto.xrpc_client.models.com.atproto.sync.get_head
-   atproto.xrpc_client.models.com.atproto.sync.get_latest_commit
-   atproto.xrpc_client.models.com.atproto.sync.get_record
-   atproto.xrpc_client.models.com.atproto.sync.get_repo
-   atproto.xrpc_client.models.com.atproto.sync.list_blobs
-   atproto.xrpc_client.models.com.atproto.sync.list_repos
-   atproto.xrpc_client.models.com.atproto.sync.notify_of_update
-   atproto.xrpc_client.models.com.atproto.sync.request_crawl
-   atproto.xrpc_client.models.com.atproto.sync.subscribe_repos
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.subscribe_repos.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.subscribe_repos.rst
deleted file mode 100644
index 969bd559..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.subscribe_repos.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.sync.subscribe\_repos
-=============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.subscribe_repos
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.import_repo.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.import_repo.rst
deleted file mode 100644
index dcc5ff79..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.import_repo.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.temp.import\_repo
-=========================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.temp.import_repo
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.push_blob.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.push_blob.rst
deleted file mode 100644
index a5f55b3f..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.push_blob.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.temp.push\_blob
-=======================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.temp.push_blob
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.rst
deleted file mode 100644
index c8a850f5..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-com.atproto.temp
-============================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.temp
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto.temp.fetch_labels
-   atproto.xrpc_client.models.com.atproto.temp.import_repo
-   atproto.xrpc_client.models.com.atproto.temp.push_blob
-   atproto.xrpc_client.models.com.atproto.temp.transfer_account
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.transfer_account.rst b/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.transfer_account.rst
deleted file mode 100644
index d8379911..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.transfer_account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-com.atproto.temp.transfer\_account
-==============================================================
-
-.. automodule:: atproto.xrpc_client.models.com.atproto.temp.transfer_account
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.rst b/docs/source/atproto/atproto.xrpc_client.models.com.rst
deleted file mode 100644
index 2690afa2..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.com.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-com
-===============================
-
-.. automodule:: atproto.xrpc_client.models.com
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.com.atproto
diff --git a/docs/source/atproto/atproto.xrpc_client.models.common.rst b/docs/source/atproto/atproto.xrpc_client.models.common.rst
deleted file mode 100644
index c2be0eb5..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.common.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-common
-==================================
-
-.. automodule:: atproto.xrpc_client.models.common
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.languages.rst b/docs/source/atproto/atproto.xrpc_client.models.languages.rst
deleted file mode 100644
index d4c1f51d..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.languages.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-languages
-=====================================
-
-.. automodule:: atproto.xrpc_client.models.languages
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.rst b/docs/source/atproto/atproto.xrpc_client.models.rst
deleted file mode 100644
index 8aacf1c6..00000000
--- a/docs/source/atproto/atproto.xrpc_client.models.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-atproto.xrpc\_client.models
-===========================
-
-.. automodule:: atproto.xrpc_client.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.app
-   atproto.xrpc_client.models.com
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.models.base
-   atproto.xrpc_client.models.blob_ref
-   atproto.xrpc_client.models.common
-   atproto.xrpc_client.models.dot_dict
-   atproto.xrpc_client.models.languages
-   atproto.xrpc_client.models.models_loader
-   atproto.xrpc_client.models.type_conversion
-   atproto.xrpc_client.models.unknown_type
-   atproto.xrpc_client.models.utils
diff --git a/docs/source/atproto/atproto.xrpc_client.namespaces.async_ns.rst b/docs/source/atproto/atproto.xrpc_client.namespaces.async_ns.rst
deleted file mode 100644
index c5a098c8..00000000
--- a/docs/source/atproto/atproto.xrpc_client.namespaces.async_ns.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.namespaces.async\_ns
-=========================================
-
-.. automodule:: atproto.xrpc_client.namespaces.async_ns
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.namespaces.rst b/docs/source/atproto/atproto.xrpc_client.namespaces.rst
deleted file mode 100644
index 99550c12..00000000
--- a/docs/source/atproto/atproto.xrpc_client.namespaces.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-atproto.xrpc\_client.namespaces
-===============================
-
-.. automodule:: atproto.xrpc_client.namespaces
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.namespaces.async_ns
-   atproto.xrpc_client.namespaces.base
-   atproto.xrpc_client.namespaces.sync_ns
diff --git a/docs/source/atproto/atproto.xrpc_client.namespaces.sync_ns.rst b/docs/source/atproto/atproto.xrpc_client.namespaces.sync_ns.rst
deleted file mode 100644
index 2921eae0..00000000
--- a/docs/source/atproto/atproto.xrpc_client.namespaces.sync_ns.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_client.namespaces.sync\_ns
-========================================
-
-.. automodule:: atproto.xrpc_client.namespaces.sync_ns
-   :members:
-   :undoc-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.rst b/docs/source/atproto/atproto.xrpc_client.rst
deleted file mode 100644
index 78f98258..00000000
--- a/docs/source/atproto/atproto.xrpc_client.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-atproto.xrpc\_client
-====================
-
-.. automodule:: atproto.xrpc_client
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.client
-   atproto.xrpc_client.models
-   atproto.xrpc_client.namespaces
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   atproto.xrpc_client.request
diff --git a/docs/source/atproto/atproto.xrpc_server.rst b/docs/source/atproto/atproto.xrpc_server.rst
deleted file mode 100644
index a14e9eb2..00000000
--- a/docs/source/atproto/atproto.xrpc_server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-atproto.xrpc\_server
-====================
-
-.. automodule:: atproto.xrpc_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/atproto/atproto_cli.cli.rst b/docs/source/atproto/atproto_cli.cli.rst
new file mode 100644
index 00000000..cc7e9608
--- /dev/null
+++ b/docs/source/atproto/atproto_cli.cli.rst
@@ -0,0 +1,7 @@
+atproto\_cli.cli
+================
+
+.. automodule:: atproto_cli.cli
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.utils.rst b/docs/source/atproto/atproto_cli.rst
similarity index 55%
rename from docs/source/atproto/atproto.utils.rst
rename to docs/source/atproto/atproto_cli.rst
index fe03e41e..e9f881e2 100644
--- a/docs/source/atproto/atproto.utils.rst
+++ b/docs/source/atproto/atproto_cli.rst
@@ -1,7 +1,7 @@
-atproto.utils
-=============
+atproto\_cli
+============
 
-.. automodule:: atproto.utils
+.. automodule:: atproto_cli
    :members:
    :undoc-members:
    :show-inheritance:
@@ -12,4 +12,4 @@ Submodules
 .. toctree::
    :maxdepth: 4
 
-   atproto.utils.text_builder
+   atproto_cli.cli
diff --git a/docs/source/atproto/atproto.xrpc_client.namespaces.base.rst b/docs/source/atproto/atproto_client.client.async_client.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.namespaces.base.rst
rename to docs/source/atproto/atproto_client.client.async_client.rst
index 82d90ede..c4c23f5d 100644
--- a/docs/source/atproto/atproto.xrpc_client.namespaces.base.rst
+++ b/docs/source/atproto/atproto_client.client.async_client.rst
@@ -1,7 +1,7 @@
-atproto.xrpc\_client.namespaces.base
+atproto\_client.client.async\_client
 ====================================
 
-.. automodule:: atproto.xrpc_client.namespaces.base
+.. automodule:: atproto_client.client.async_client
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.utils.rst b/docs/source/atproto/atproto_client.client.async_raw.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.utils.rst
rename to docs/source/atproto/atproto_client.client.async_raw.rst
index 8c84134c..54d0d37c 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.utils.rst
+++ b/docs/source/atproto/atproto_client.client.async_raw.rst
@@ -1,7 +1,7 @@
-utils
+atproto\_client.client.async\_raw
 =================================
 
-.. automodule:: atproto.xrpc_client.models.utils
+.. automodule:: atproto_client.client.async_raw
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.utils.text_builder.rst b/docs/source/atproto/atproto_client.client.auth.rst
similarity index 53%
rename from docs/source/atproto/atproto.utils.text_builder.rst
rename to docs/source/atproto/atproto_client.client.auth.rst
index 300bead3..04d78356 100644
--- a/docs/source/atproto/atproto.utils.text_builder.rst
+++ b/docs/source/atproto/atproto_client.client.auth.rst
@@ -1,7 +1,7 @@
-atproto.utils.text\_builder
+atproto\_client.client.auth
 ===========================
 
-.. automodule:: atproto.utils.text_builder
+.. automodule:: atproto_client.client.auth
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.base.rst b/docs/source/atproto/atproto_client.client.base.rst
new file mode 100644
index 00000000..50877acb
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.base.rst
@@ -0,0 +1,7 @@
+atproto\_client.client.base
+===========================
+
+.. automodule:: atproto_client.client.base
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.client.rst b/docs/source/atproto/atproto_client.client.client.rst
new file mode 100644
index 00000000..078eb86d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.client.rst
@@ -0,0 +1,7 @@
+atproto\_client.client.client
+=============================
+
+.. automodule:: atproto_client.client.client
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.methods_mixin.rst b/docs/source/atproto/atproto_client.client.methods_mixin.rst
new file mode 100644
index 00000000..5b2a91e8
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.methods_mixin.rst
@@ -0,0 +1,16 @@
+atproto\_client.client.methods\_mixin
+=====================================
+
+.. automodule:: atproto_client.client.methods_mixin
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.client.methods_mixin.session
+   atproto_client.client.methods_mixin.time
diff --git a/docs/source/atproto/atproto_client.client.methods_mixin.session.rst b/docs/source/atproto/atproto_client.client.methods_mixin.session.rst
new file mode 100644
index 00000000..73bfebc6
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.methods_mixin.session.rst
@@ -0,0 +1,7 @@
+atproto\_client.client.methods\_mixin.session
+=============================================
+
+.. automodule:: atproto_client.client.methods_mixin.session
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.methods_mixin.time.rst b/docs/source/atproto/atproto_client.client.methods_mixin.time.rst
new file mode 100644
index 00000000..b3ca080e
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.methods_mixin.time.rst
@@ -0,0 +1,7 @@
+atproto\_client.client.methods\_mixin.time
+==========================================
+
+.. automodule:: atproto_client.client.methods_mixin.time
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.raw.rst b/docs/source/atproto/atproto_client.client.raw.rst
new file mode 100644
index 00000000..68459bf0
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.raw.rst
@@ -0,0 +1,7 @@
+atproto\_client.client.raw
+==========================
+
+.. automodule:: atproto_client.client.raw
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.client.rst b/docs/source/atproto/atproto_client.client.rst
new file mode 100644
index 00000000..3981b05b
--- /dev/null
+++ b/docs/source/atproto/atproto_client.client.rst
@@ -0,0 +1,28 @@
+atproto\_client.client
+======================
+
+.. automodule:: atproto_client.client
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.client.methods_mixin
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.client.async_client
+   atproto_client.client.async_raw
+   atproto_client.client.auth
+   atproto_client.client.base
+   atproto_client.client.client
+   atproto_client.client.raw
diff --git a/docs/source/atproto/atproto_client.exceptions.rst b/docs/source/atproto/atproto_client.exceptions.rst
new file mode 100644
index 00000000..f87fa30f
--- /dev/null
+++ b/docs/source/atproto/atproto_client.exceptions.rst
@@ -0,0 +1,7 @@
+atproto\_client.exceptions
+==========================
+
+.. automodule:: atproto_client.exceptions
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.models_loader.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.defs.rst
similarity index 55%
rename from docs/source/atproto/atproto.xrpc_client.models.models_loader.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.actor.defs.rst
index 8156bfef..b6c217d1 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.models_loader.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.defs.rst
@@ -1,7 +1,7 @@
-models\_loader
+app.bsky.actor.defs
 ==========================================
 
-.. automodule:: atproto.xrpc_client.models.models_loader
+.. automodule:: atproto_client.models.app.bsky.actor.defs
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.actor.get_preferences.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_preferences.rst
new file mode 100644
index 00000000..583fa883
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_preferences.rst
@@ -0,0 +1,7 @@
+app.bsky.actor.get\_preferences
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.actor.get_preferences
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_profile.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.defs.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.actor.get_profile.rst
index b98bfa81..ea613755 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.defs.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_profile.rst
@@ -1,7 +1,7 @@
-com.atproto.label.defs
+app.bsky.actor.get\_profile
 ==================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.label.defs
+.. automodule:: atproto_client.models.app.bsky.actor.get_profile
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listitem.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_profiles.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listitem.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.actor.get_profiles.rst
index 1a5fa5f1..453160b7 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.listitem.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_profiles.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.listitem
+app.bsky.actor.get\_profiles
 ===================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.listitem
+.. automodule:: atproto_client.models.app.bsky.actor.get_profiles
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.actor.get_suggestions.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_suggestions.rst
new file mode 100644
index 00000000..c1804338
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.get_suggestions.rst
@@ -0,0 +1,7 @@
+app.bsky.actor.get\_suggestions
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.actor.get_suggestions
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.actor.profile.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.profile.rst
new file mode 100644
index 00000000..8bcb7dd7
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.profile.rst
@@ -0,0 +1,7 @@
+app.bsky.actor.profile
+=============================================
+
+.. automodule:: atproto_client.models.app.bsky.actor.profile
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.actor.put_preferences.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.put_preferences.rst
new file mode 100644
index 00000000..569ce198
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.put_preferences.rst
@@ -0,0 +1,7 @@
+app.bsky.actor.put\_preferences
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.actor.put_preferences
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.actor.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.rst
new file mode 100644
index 00000000..036c9342
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.rst
@@ -0,0 +1,23 @@
+app.bsky.actor
+=====================================
+
+.. automodule:: atproto_client.models.app.bsky.actor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.actor.defs
+   atproto_client.models.app.bsky.actor.get_preferences
+   atproto_client.models.app.bsky.actor.get_profile
+   atproto_client.models.app.bsky.actor.get_profiles
+   atproto_client.models.app.bsky.actor.get_suggestions
+   atproto_client.models.app.bsky.actor.profile
+   atproto_client.models.app.bsky.actor.put_preferences
+   atproto_client.models.app.bsky.actor.search_actors
+   atproto_client.models.app.bsky.actor.search_actors_typeahead
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors.rst
index 35eed726..eba2618c 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_list
+app.bsky.actor.search\_actors
 ====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_list
+.. automodule:: atproto_client.models.app.bsky.actor.search_actors
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.subscribe_labels.rst b/docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors_typeahead.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.subscribe_labels.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors_typeahead.rst
index 3199b5cc..6e253431 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.label.subscribe_labels.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.actor.search_actors_typeahead.rst
@@ -1,7 +1,7 @@
-com.atproto.label.subscribe\_labels
+app.bsky.actor.search\_actors\_typeahead
 ===============================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.label.subscribe_labels
+.. automodule:: atproto_client.models.app.bsky.actor.search_actors_typeahead
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.like.rst b/docs/source/atproto/atproto_client.models.app.bsky.embed.external.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.like.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.embed.external.rst
index 7e305b98..f2179075 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.like.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.embed.external.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.like
+app.bsky.embed.external
 ==============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.like
+.. automodule:: atproto_client.models.app.bsky.embed.external
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.type_conversion.rst b/docs/source/atproto/atproto_client.models.app.bsky.embed.images.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.type_conversion.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.embed.images.rst
index 0120d02c..7a49342b 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.type_conversion.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.embed.images.rst
@@ -1,7 +1,7 @@
-type\_conversion
+app.bsky.embed.images
 ============================================
 
-.. automodule:: atproto.xrpc_client.models.type_conversion
+.. automodule:: atproto_client.models.app.bsky.embed.images
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.embed.record.rst b/docs/source/atproto/atproto_client.models.app.bsky.embed.record.rst
new file mode 100644
index 00000000..f7a7658c
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.embed.record.rst
@@ -0,0 +1,7 @@
+app.bsky.embed.record
+============================================
+
+.. automodule:: atproto_client.models.app.bsky.embed.record
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors.rst b/docs/source/atproto/atproto_client.models.app.bsky.embed.record_with_media.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.embed.record_with_media.rst
index 48114dca..f41e9153 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.search_actors.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.embed.record_with_media.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.search\_actors
+app.bsky.embed.record\_with\_media
 =========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.search_actors
+.. automodule:: atproto_client.models.app.bsky.embed.record_with_media
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.embed.rst b/docs/source/atproto/atproto_client.models.app.bsky.embed.rst
new file mode 100644
index 00000000..8a2b9185
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.embed.rst
@@ -0,0 +1,18 @@
+app.bsky.embed
+=====================================
+
+.. automodule:: atproto_client.models.app.bsky.embed
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.embed.external
+   atproto_client.models.app.bsky.embed.images
+   atproto_client.models.app.bsky.embed.record
+   atproto_client.models.app.bsky.embed.record_with_media
diff --git a/docs/source/atproto/atproto.xrpc_client.models.unknown_type.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.defs.rst
similarity index 55%
rename from docs/source/atproto/atproto.xrpc_client.models.unknown_type.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.defs.rst
index 13cc93d1..4a9d7f0e 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.unknown_type.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.defs.rst
@@ -1,7 +1,7 @@
-unknown\_type
+app.bsky.feed.defs
 =========================================
 
-.. automodule:: atproto.xrpc_client.models.unknown_type
+.. automodule:: atproto_client.models.app.bsky.feed.defs
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generator.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.describe_feed_generator.rst
similarity index 55%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generator.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.describe_feed_generator.rst
index 341cd845..98c08a0b 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generator.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.describe_feed_generator.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_feed\_generator
+app.bsky.feed.describe\_feed\_generator
 ==============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_feed_generator
+.. automodule:: atproto_client.models.app.bsky.feed.describe_feed_generator
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.post.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.generator.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.post.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.generator.rst
index 5881e711..33ae5cd9 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.post.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.generator.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.post
+app.bsky.feed.generator
 ==============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.post
+.. automodule:: atproto_client.models.app.bsky.feed.generator
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_head.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_feeds.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_head.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_feeds.rst
index 4dbb175a..a8f8c2e6 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_head.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_feeds.rst
@@ -1,7 +1,7 @@
-com.atproto.sync.get\_head
+app.bsky.feed.get\_actor\_feeds
 ======================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_head
+.. automodule:: atproto_client.models.app.bsky.feed.get_actor_feeds
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_blocks.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_likes.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_blocks.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_likes.rst
index d2264147..e1c3411a 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_blocks.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_actor_likes.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_blocks
+app.bsky.feed.get\_actor\_likes
 ======================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_blocks
+.. automodule:: atproto_client.models.app.bsky.feed.get_actor_likes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_author_feed.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_author_feed.rst
index 6e3f5b29..0a530cfb 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.mute_actor.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_author_feed.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.mute\_actor
+app.bsky.feed.get\_author\_feed
 ======================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.mute_actor
+.. automodule:: atproto_client.models.app.bsky.feed.get_author_feed
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.defs.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed.rst
index 16aedc1a..df991af7 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.defs.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.defs
+app.bsky.feed.get\_feed
 ==============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.defs
+.. automodule:: atproto_client.models.app.bsky.feed.get_feed
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_record.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generator.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_record.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generator.rst
index f4854884..3eae117e 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.get_record.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generator.rst
@@ -1,7 +1,7 @@
-com.atproto.admin.get\_record
+app.bsky.feed.get\_feed\_generator
 =========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.get_record
+.. automodule:: atproto_client.models.app.bsky.feed.get_feed_generator
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.fetch_labels.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generators.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.fetch_labels.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generators.rst
index 5bb9abd9..0501f427 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.temp.fetch_labels.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_generators.rst
@@ -1,7 +1,7 @@
-com.atproto.temp.fetch\_labels
+app.bsky.feed.get\_feed\_generators
 ==========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.temp.fetch_labels
+.. automodule:: atproto_client.models.app.bsky.feed.get_feed_generators
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profiles.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_skeleton.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profiles.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_skeleton.rst
index c1fc85e8..5af4dca5 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profiles.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_feed_skeleton.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.get\_profiles
+app.bsky.feed.get\_feed\_skeleton
 ========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.get_profiles
+.. automodule:: atproto_client.models.app.bsky.feed.get_feed_skeleton
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.list.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_likes.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.list.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_likes.rst
index 6dad343d..8c21ca2a 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.list.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_likes.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.list
+app.bsky.feed.get\_likes
 ===============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.list
+.. automodule:: atproto_client.models.app.bsky.feed.get_likes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.threadgate.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_list_feed.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.threadgate.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_list_feed.rst
index 4ecc870c..b7935a26 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.threadgate.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_list_feed.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.threadgate
+app.bsky.feed.get\_list\_feed
 ====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.threadgate
+.. automodule:: atproto_client.models.app.bsky.feed.get_list_feed
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blob.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_post_thread.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blob.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_post_thread.rst
index 2d69720f..c453d327 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_blob.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_post_thread.rst
@@ -1,7 +1,7 @@
-com.atproto.sync.get\_blob
+app.bsky.feed.get\_post\_thread
 ======================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_blob
+.. automodule:: atproto_client.models.app.bsky.feed.get_post_thread
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_posts.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.defs.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_posts.rst
index 5f31efb3..a0e12b93 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.defs.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_posts.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.defs
+app.bsky.feed.get\_posts
 ===============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.defs
+.. automodule:: atproto_client.models.app.bsky.feed.get_posts
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.get_reposted_by.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_reposted_by.rst
new file mode 100644
index 00000000..cc9e440b
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_reposted_by.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.get\_reposted\_by
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.get_reposted_by
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.apply_writes.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_suggested_feeds.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.apply_writes.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_suggested_feeds.rst
index 7aa390dc..5f69d9a2 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.apply_writes.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_suggested_feeds.rst
@@ -1,7 +1,7 @@
-com.atproto.repo.apply\_writes
+app.bsky.feed.get\_suggested\_feeds
 ==========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.apply_writes
+.. automodule:: atproto_client.models.app.bsky.feed.get_suggested_feeds
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.profile.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_timeline.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.profile.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.feed.get_timeline.rst
index dfdec50e..5b157db4 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.profile.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.get_timeline.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.profile
+app.bsky.feed.get\_timeline
 ==================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.profile
+.. automodule:: atproto_client.models.app.bsky.feed.get_timeline
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.like.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.like.rst
new file mode 100644
index 00000000..94ffe1f2
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.like.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.like
+=========================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.like
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.post.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.post.rst
new file mode 100644
index 00000000..cf74da48
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.post.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.post
+=========================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.post
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.repost.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.repost.rst
new file mode 100644
index 00000000..a68c9349
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.repost.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.repost
+===========================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.repost
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.rst
new file mode 100644
index 00000000..b9245b57
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.rst
@@ -0,0 +1,36 @@
+app.bsky.feed
+====================================
+
+.. automodule:: atproto_client.models.app.bsky.feed
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.feed.defs
+   atproto_client.models.app.bsky.feed.describe_feed_generator
+   atproto_client.models.app.bsky.feed.generator
+   atproto_client.models.app.bsky.feed.get_actor_feeds
+   atproto_client.models.app.bsky.feed.get_actor_likes
+   atproto_client.models.app.bsky.feed.get_author_feed
+   atproto_client.models.app.bsky.feed.get_feed
+   atproto_client.models.app.bsky.feed.get_feed_generator
+   atproto_client.models.app.bsky.feed.get_feed_generators
+   atproto_client.models.app.bsky.feed.get_feed_skeleton
+   atproto_client.models.app.bsky.feed.get_likes
+   atproto_client.models.app.bsky.feed.get_list_feed
+   atproto_client.models.app.bsky.feed.get_post_thread
+   atproto_client.models.app.bsky.feed.get_posts
+   atproto_client.models.app.bsky.feed.get_reposted_by
+   atproto_client.models.app.bsky.feed.get_suggested_feeds
+   atproto_client.models.app.bsky.feed.get_timeline
+   atproto_client.models.app.bsky.feed.like
+   atproto_client.models.app.bsky.feed.post
+   atproto_client.models.app.bsky.feed.repost
+   atproto_client.models.app.bsky.feed.search_posts
+   atproto_client.models.app.bsky.feed.threadgate
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.search_posts.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.search_posts.rst
new file mode 100644
index 00000000..e8867b18
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.search_posts.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.search\_posts
+==================================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.search_posts
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.feed.threadgate.rst b/docs/source/atproto/atproto_client.models.app.bsky.feed.threadgate.rst
new file mode 100644
index 00000000..7dbc1493
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.feed.threadgate.rst
@@ -0,0 +1,7 @@
+app.bsky.feed.threadgate
+===============================================
+
+.. automodule:: atproto_client.models.app.bsky.feed.threadgate
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.block.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.block.rst
new file mode 100644
index 00000000..5308e2fa
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.block.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.block
+===========================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.block
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.defs.rst
new file mode 100644
index 00000000..992e947d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.defs.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.defs
+==========================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.defs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.follow.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.follow.rst
new file mode 100644
index 00000000..04af26a4
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.follow.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.follow
+============================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.follow
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.images.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_blocks.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.images.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_blocks.rst
index e4413739..a73ffb5c 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.images.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_blocks.rst
@@ -1,7 +1,7 @@
-app.bsky.embed.images
+app.bsky.graph.get\_blocks
 =================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.embed.images
+.. automodule:: atproto_client.models.app.bsky.graph.get_blocks
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_likes.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_followers.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_likes.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_followers.rst
index 12e39fd3..943d4f60 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_likes.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_followers.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_likes
+app.bsky.graph.get\_followers
 ====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_likes
+.. automodule:: atproto_client.models.app.bsky.graph.get_followers
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.get_follows.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_follows.rst
new file mode 100644
index 00000000..1a3839b6
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_follows.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.get\_follows
+==================================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.get_follows
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.defs.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_list.rst
index c790fdb8..96797adc 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.defs.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.defs
+app.bsky.graph.get\_list
 ===============================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.defs
+.. automodule:: atproto_client.models.app.bsky.graph.get_list
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profile.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_blocks.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profile.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_blocks.rst
index d329e9fa..b99638ca 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_profile.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_blocks.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.get\_profile
+app.bsky.graph.get\_list\_blocks
 =======================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.get_profile
+.. automodule:: atproto_client.models.app.bsky.graph.get_list_blocks
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_mutes.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_mutes.rst
new file mode 100644
index 00000000..7b90b37d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_list_mutes.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.get\_list\_mutes
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.get_list_mutes
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.repost.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_lists.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.repost.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_lists.rst
index 9cf213fc..a603577c 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.repost.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_lists.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.repost
+app.bsky.graph.get\_lists
 ================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.repost
+.. automodule:: atproto_client.models.app.bsky.graph.get_lists
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.block.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_mutes.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.block.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_mutes.rst
index 407a9ed1..718231c7 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.block.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_mutes.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.block
+app.bsky.graph.get\_mutes
 ================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.block
+.. automodule:: atproto_client.models.app.bsky.graph.get_mutes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst
similarity index 61%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst
index a88f2d4f..fb4a1158 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor.rst
@@ -1,7 +1,7 @@
 app.bsky.graph.get\_suggested\_follows\_by\_actor
-=============================================================================
+========================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_suggested_follows_by_actor
+.. automodule:: atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.list.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.list.rst
new file mode 100644
index 00000000..b05d2b12
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.list.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.list
+==========================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.list
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.listblock.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.listblock.rst
new file mode 100644
index 00000000..89c1b513
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.listblock.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.listblock
+===============================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.listblock
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.listitem.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.listitem.rst
new file mode 100644
index 00000000..c32851c5
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.listitem.rst
@@ -0,0 +1,7 @@
+app.bsky.graph.listitem
+==============================================
+
+.. automodule:: atproto_client.models.app.bsky.graph.listitem
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor.rst
index b5f0d352..9a853ff6 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor.rst
@@ -1,7 +1,7 @@
-app.bsky.embed.record
+app.bsky.graph.mute\_actor
 =================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.embed.record
+.. automodule:: atproto_client.models.app.bsky.graph.mute_actor
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_timeline.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor_list.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_timeline.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor_list.rst
index d8e50ff0..e52e85e8 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_timeline.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.mute_actor_list.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_timeline
+app.bsky.graph.mute\_actor\_list
 =======================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_timeline
+.. automodule:: atproto_client.models.app.bsky.graph.mute_actor_list
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.graph.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.rst
new file mode 100644
index 00000000..f5b544bf
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.rst
@@ -0,0 +1,33 @@
+app.bsky.graph
+=====================================
+
+.. automodule:: atproto_client.models.app.bsky.graph
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.graph.block
+   atproto_client.models.app.bsky.graph.defs
+   atproto_client.models.app.bsky.graph.follow
+   atproto_client.models.app.bsky.graph.get_blocks
+   atproto_client.models.app.bsky.graph.get_followers
+   atproto_client.models.app.bsky.graph.get_follows
+   atproto_client.models.app.bsky.graph.get_list
+   atproto_client.models.app.bsky.graph.get_list_blocks
+   atproto_client.models.app.bsky.graph.get_list_mutes
+   atproto_client.models.app.bsky.graph.get_lists
+   atproto_client.models.app.bsky.graph.get_mutes
+   atproto_client.models.app.bsky.graph.get_suggested_follows_by_actor
+   atproto_client.models.app.bsky.graph.list
+   atproto_client.models.app.bsky.graph.listblock
+   atproto_client.models.app.bsky.graph.listitem
+   atproto_client.models.app.bsky.graph.mute_actor
+   atproto_client.models.app.bsky.graph.mute_actor_list
+   atproto_client.models.app.bsky.graph.unmute_actor
+   atproto_client.models.app.bsky.graph.unmute_actor_list
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.external.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.external.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor.rst
index 1695d633..c2f174f2 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.external.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor.rst
@@ -1,7 +1,7 @@
-app.bsky.embed.external
+app.bsky.graph.unmute\_actor
 ===================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.embed.external
+.. automodule:: atproto_client.models.app.bsky.graph.unmute_actor
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_list_feed.rst b/docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor_list.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_list_feed.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor_list.rst
index fb23c757..2f1e59b6 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_list_feed.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.graph.unmute_actor_list.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_list\_feed
+app.bsky.graph.unmute\_actor\_list
 =========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_list_feed
+.. automodule:: atproto_client.models.app.bsky.graph.unmute_actor_list
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generators.rst b/docs/source/atproto/atproto_client.models.app.bsky.notification.get_unread_count.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generators.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.notification.get_unread_count.rst
index da42d27b..75119142 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_generators.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.notification.get_unread_count.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_feed\_generators
+app.bsky.notification.get\_unread\_count
 ===============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_feed_generators
+.. automodule:: atproto_client.models.app.bsky.notification.get_unread_count
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.list_notifications.rst b/docs/source/atproto/atproto_client.models.app.bsky.notification.list_notifications.rst
similarity index 64%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.list_notifications.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.notification.list_notifications.rst
index 506e43f3..c8f3d775 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.notification.list_notifications.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.notification.list_notifications.rst
@@ -1,7 +1,7 @@
 app.bsky.notification.list\_notifications
-=====================================================================
+================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.notification.list_notifications
+.. automodule:: atproto_client.models.app.bsky.notification.list_notifications
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds.rst b/docs/source/atproto/atproto_client.models.app.bsky.notification.register_push.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.notification.register_push.rst
index 824f4eec..cba47be7 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.notification.register_push.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_actor\_feeds
+app.bsky.notification.register\_push
 ===========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_actor_feeds
+.. automodule:: atproto_client.models.app.bsky.notification.register_push
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.notification.rst b/docs/source/atproto/atproto_client.models.app.bsky.notification.rst
new file mode 100644
index 00000000..a4607fa5
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.notification.rst
@@ -0,0 +1,18 @@
+app.bsky.notification
+============================================
+
+.. automodule:: atproto_client.models.app.bsky.notification
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.notification.get_unread_count
+   atproto_client.models.app.bsky.notification.list_notifications
+   atproto_client.models.app.bsky.notification.register_push
+   atproto_client.models.app.bsky.notification.update_seen
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_followers.rst b/docs/source/atproto/atproto_client.models.app.bsky.notification.update_seen.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_followers.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.notification.update_seen.rst
index e704b0fe..cf25a3c1 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_followers.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.notification.update_seen.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_followers
+app.bsky.notification.update\_seen
 =========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_followers
+.. automodule:: atproto_client.models.app.bsky.notification.update_seen
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.richtext.facet.rst b/docs/source/atproto/atproto_client.models.app.bsky.richtext.facet.rst
new file mode 100644
index 00000000..deca7702
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.richtext.facet.rst
@@ -0,0 +1,7 @@
+app.bsky.richtext.facet
+==============================================
+
+.. automodule:: atproto_client.models.app.bsky.richtext.facet
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.richtext.rst b/docs/source/atproto/atproto_client.models.app.bsky.richtext.rst
new file mode 100644
index 00000000..4676c989
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.richtext.rst
@@ -0,0 +1,15 @@
+app.bsky.richtext
+========================================
+
+.. automodule:: atproto_client.models.app.bsky.richtext
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.richtext.facet
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.rst b/docs/source/atproto/atproto_client.models.app.bsky.rst
new file mode 100644
index 00000000..f1528d27
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.rst
@@ -0,0 +1,21 @@
+app.bsky
+===============================
+
+.. automodule:: atproto_client.models.app.bsky
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.actor
+   atproto_client.models.app.bsky.embed
+   atproto_client.models.app.bsky.feed
+   atproto_client.models.app.bsky.graph
+   atproto_client.models.app.bsky.notification
+   atproto_client.models.app.bsky.richtext
+   atproto_client.models.app.bsky.unspecced
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.unspecced.defs.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.defs.rst
new file mode 100644
index 00000000..028c779d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.defs.rst
@@ -0,0 +1,7 @@
+app.bsky.unspecced.defs
+==============================================
+
+.. automodule:: atproto_client.models.app.bsky.unspecced.defs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular.rst
new file mode 100644
index 00000000..fa3bb9cc
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular.rst
@@ -0,0 +1,7 @@
+app.bsky.unspecced.get\_popular
+======================================================
+
+.. automodule:: atproto_client.models.app.bsky.unspecced.get_popular
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular_feed_generators.rst
similarity index 61%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular_feed_generators.rst
index 1f7388a2..4e2d1efa 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_popular_feed_generators.rst
@@ -1,7 +1,7 @@
 app.bsky.unspecced.get\_popular\_feed\_generators
-=============================================================================
+========================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.get_popular_feed_generators
+.. automodule:: atproto_client.models.app.bsky.unspecced.get_popular_feed_generators
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_timeline_skeleton.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_timeline_skeleton.rst
index 19d441c5..4bc57aeb 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.get_timeline_skeleton.rst
@@ -1,7 +1,7 @@
 app.bsky.unspecced.get\_timeline\_skeleton
-======================================================================
+=================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.get_timeline_skeleton
+.. automodule:: atproto_client.models.app.bsky.unspecced.get_timeline_skeleton
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.bsky.unspecced.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.rst
new file mode 100644
index 00000000..b15e2733
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.rst
@@ -0,0 +1,20 @@
+app.bsky.unspecced
+=========================================
+
+.. automodule:: atproto_client.models.app.bsky.unspecced
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky.unspecced.defs
+   atproto_client.models.app.bsky.unspecced.get_popular
+   atproto_client.models.app.bsky.unspecced.get_popular_feed_generators
+   atproto_client.models.app.bsky.unspecced.get_timeline_skeleton
+   atproto_client.models.app.bsky.unspecced.search_actors_skeleton
+   atproto_client.models.app.bsky.unspecced.search_posts_skeleton
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_actors_skeleton.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_actors_skeleton.rst
index 24ce672d..9543c7ff 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_actors_skeleton.rst
@@ -1,7 +1,7 @@
 app.bsky.unspecced.search\_actors\_skeleton
-=======================================================================
+==================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.search_actors_skeleton
+.. automodule:: atproto_client.models.app.bsky.unspecced.search_actors_skeleton
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton.rst b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_posts_skeleton.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton.rst
rename to docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_posts_skeleton.rst
index b5e6fe9f..16127e28 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton.rst
+++ b/docs/source/atproto/atproto_client.models.app.bsky.unspecced.search_posts_skeleton.rst
@@ -1,7 +1,7 @@
 app.bsky.unspecced.search\_posts\_skeleton
-======================================================================
+=================================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.unspecced.search_posts_skeleton
+.. automodule:: atproto_client.models.app.bsky.unspecced.search_posts_skeleton
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.app.rst b/docs/source/atproto/atproto_client.models.app.rst
new file mode 100644
index 00000000..8c8b737d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.app.rst
@@ -0,0 +1,15 @@
+app
+==========================
+
+.. automodule:: atproto_client.models.app
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app.bsky
diff --git a/docs/source/atproto/atproto_client.models.base.rst b/docs/source/atproto/atproto_client.models.base.rst
new file mode 100644
index 00000000..0244d1df
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.base.rst
@@ -0,0 +1,7 @@
+base
+===========================
+
+.. automodule:: atproto_client.models.base
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.base.rst b/docs/source/atproto/atproto_client.models.blob_ref.rst
similarity index 60%
rename from docs/source/atproto/atproto.xrpc_client.models.base.rst
rename to docs/source/atproto/atproto_client.models.blob_ref.rst
index 742afe2b..87732fca 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.base.rst
+++ b/docs/source/atproto/atproto_client.models.blob_ref.rst
@@ -1,7 +1,7 @@
-base
+blob\_ref
 ================================
 
-.. automodule:: atproto.xrpc_client.models.base
+.. automodule:: atproto_client.models.blob_ref
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.defs.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.defs.rst
new file mode 100644
index 00000000..49c7e614
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.defs.rst
@@ -0,0 +1,7 @@
+com.atproto.admin.defs
+=============================================
+
+.. automodule:: atproto_client.models.com.atproto.admin.defs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.delete_account.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.delete_account.rst
index b3f373f0..cf9456e9 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.delete_account.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.unmute\_actor
+com.atproto.admin.delete\_account
 ========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.unmute_actor
+.. automodule:: atproto_client.models.com.atproto.admin.delete_account
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_account_invites.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.disable_account_invites.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_account_invites.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.disable_account_invites.rst
index 12849435..47152154 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.disable_account_invites.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.disable_account_invites.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.disable\_account\_invites
-=======================================================================
+==================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.disable_account_invites
+.. automodule:: atproto_client.models.com.atproto.admin.disable_account_invites
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.disable_invite_codes.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.disable_invite_codes.rst
index a60080f2..a5398c62 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.disable_invite_codes.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_suggested\_feeds
+com.atproto.admin.disable\_invite\_codes
 ===============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_suggested_feeds
+.. automodule:: atproto_client.models.com.atproto.admin.disable_invite_codes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.emit_moderation_event.rst
similarity index 64%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.emit_moderation_event.rst
index 44257f63..9ab388b7 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.emit_moderation_event.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.emit\_moderation\_event
-=====================================================================
+================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.emit_moderation_event
+.. automodule:: atproto_client.models.com.atproto.admin.emit_moderation_event
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.enable_account_invites.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.enable_account_invites.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.enable_account_invites.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.enable_account_invites.rst
index 5666f8d9..16d5ecd9 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.enable_account_invites.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.enable_account_invites.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.enable\_account\_invites
-======================================================================
+=================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.enable_account_invites
+.. automodule:: atproto_client.models.com.atproto.admin.enable_account_invites
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_preferences.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_account_info.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_preferences.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.get_account_info.rst
index 5253c185..7bb431af 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_preferences.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_account_info.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.get\_preferences
+com.atproto.admin.get\_account\_info
 ===========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.get_preferences
+.. automodule:: atproto_client.models.com.atproto.admin.get_account_info
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_suggestions.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_invite_codes.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_suggestions.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.get_invite_codes.rst
index 253f0c1b..e89de4d4 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.get_suggestions.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_invite_codes.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.get\_suggestions
+com.atproto.admin.get\_invite\_codes
 ===========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.get_suggestions
+.. automodule:: atproto_client.models.com.atproto.admin.get_invite_codes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.update_handle.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_moderation_event.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.update_handle.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.get_moderation_event.rst
index f3adf53c..6be7e2ae 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.identity.update_handle.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_moderation_event.rst
@@ -1,7 +1,7 @@
-com.atproto.identity.update\_handle
+com.atproto.admin.get\_moderation\_event
 ===============================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.identity.update_handle
+.. automodule:: atproto_client.models.com.atproto.admin.get_moderation_event
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_posts.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_record.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_posts.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.get_record.rst
index 031edd1b..cc0961e5 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_posts.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_record.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_posts
+com.atproto.admin.get\_record
 ====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_posts
+.. automodule:: atproto_client.models.com.atproto.admin.get_record
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.get_repo.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_repo.rst
new file mode 100644
index 00000000..22872005
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_repo.rst
@@ -0,0 +1,7 @@
+com.atproto.admin.get\_repo
+==================================================
+
+.. automodule:: atproto_client.models.com.atproto.admin.get_repo
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_subject_status.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.get_subject_status.rst
index d60955b0..9aa2850a 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.get_subject_status.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_feed\_skeleton
+com.atproto.admin.get\_subject\_status
 =============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_feed_skeleton
+.. automodule:: atproto_client.models.com.atproto.admin.get_subject_status
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_events.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_events.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_events.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_events.rst
index a229659f..1b89c665 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_events.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_events.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.query\_moderation\_events
-=======================================================================
+==================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.query_moderation_events
+.. automodule:: atproto_client.models.com.atproto.admin.query_moderation_events
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_statuses.rst
similarity index 62%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_statuses.rst
index e738fd19..97ccbe33 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.query_moderation_statuses.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.query\_moderation\_statuses
-=========================================================================
+====================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.query_moderation_statuses
+.. automodule:: atproto_client.models.com.atproto.admin.query_moderation_statuses
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.rst
new file mode 100644
index 00000000..8b073eee
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.rst
@@ -0,0 +1,33 @@
+com.atproto.admin
+========================================
+
+.. automodule:: atproto_client.models.com.atproto.admin
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.admin.defs
+   atproto_client.models.com.atproto.admin.delete_account
+   atproto_client.models.com.atproto.admin.disable_account_invites
+   atproto_client.models.com.atproto.admin.disable_invite_codes
+   atproto_client.models.com.atproto.admin.emit_moderation_event
+   atproto_client.models.com.atproto.admin.enable_account_invites
+   atproto_client.models.com.atproto.admin.get_account_info
+   atproto_client.models.com.atproto.admin.get_invite_codes
+   atproto_client.models.com.atproto.admin.get_moderation_event
+   atproto_client.models.com.atproto.admin.get_record
+   atproto_client.models.com.atproto.admin.get_repo
+   atproto_client.models.com.atproto.admin.get_subject_status
+   atproto_client.models.com.atproto.admin.query_moderation_events
+   atproto_client.models.com.atproto.admin.query_moderation_statuses
+   atproto_client.models.com.atproto.admin.search_repos
+   atproto_client.models.com.atproto.admin.send_email
+   atproto_client.models.com.atproto.admin.update_account_email
+   atproto_client.models.com.atproto.admin.update_account_handle
+   atproto_client.models.com.atproto.admin.update_subject_status
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.search_repos.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.search_repos.rst
new file mode 100644
index 00000000..1ec788e5
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.search_repos.rst
@@ -0,0 +1,7 @@
+com.atproto.admin.search\_repos
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.admin.search_repos
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.send_email.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.send_email.rst
new file mode 100644
index 00000000..65c703fc
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.send_email.rst
@@ -0,0 +1,7 @@
+com.atproto.admin.send\_email
+====================================================
+
+.. automodule:: atproto_client.models.com.atproto.admin.send_email
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_email.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_email.rst
new file mode 100644
index 00000000..ece86871
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_email.rst
@@ -0,0 +1,7 @@
+com.atproto.admin.update\_account\_email
+===============================================================
+
+.. automodule:: atproto_client.models.com.atproto.admin.update_account_email
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_handle.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_handle.rst
similarity index 64%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_handle.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_handle.rst
index 2872ca26..07be2dac 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_account_handle.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_account_handle.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.update\_account\_handle
-=====================================================================
+================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.update_account_handle
+.. automodule:: atproto_client.models.com.atproto.admin.update_account_handle
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_subject_status.rst b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_subject_status.rst
similarity index 64%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_subject_status.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.admin.update_subject_status.rst
index aed4c892..c2670e3f 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.update_subject_status.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.admin.update_subject_status.rst
@@ -1,7 +1,7 @@
 com.atproto.admin.update\_subject\_status
-=====================================================================
+================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.update_subject_status
+.. automodule:: atproto_client.models.com.atproto.admin.update_subject_status
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.identity.resolve_handle.rst b/docs/source/atproto/atproto_client.models.com.atproto.identity.resolve_handle.rst
new file mode 100644
index 00000000..582974fb
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.identity.resolve_handle.rst
@@ -0,0 +1,7 @@
+com.atproto.identity.resolve\_handle
+===========================================================
+
+.. automodule:: atproto_client.models.com.atproto.identity.resolve_handle
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.identity.rst b/docs/source/atproto/atproto_client.models.com.atproto.identity.rst
new file mode 100644
index 00000000..975fdc82
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.identity.rst
@@ -0,0 +1,16 @@
+com.atproto.identity
+===========================================
+
+.. automodule:: atproto_client.models.com.atproto.identity
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.identity.resolve_handle
+   atproto_client.models.com.atproto.identity.update_handle
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_checkout.rst b/docs/source/atproto/atproto_client.models.com.atproto.identity.update_handle.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_checkout.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.identity.update_handle.rst
index 9dceae72..893b052b 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_checkout.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.identity.update_handle.rst
@@ -1,7 +1,7 @@
-com.atproto.sync.get\_checkout
+com.atproto.identity.update\_handle
 ==========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_checkout
+.. automodule:: atproto_client.models.com.atproto.identity.update_handle
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.label.defs.rst b/docs/source/atproto/atproto_client.models.com.atproto.label.defs.rst
new file mode 100644
index 00000000..c654894b
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.label.defs.rst
@@ -0,0 +1,7 @@
+com.atproto.label.defs
+=============================================
+
+.. automodule:: atproto_client.models.com.atproto.label.defs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.label.query_labels.rst b/docs/source/atproto/atproto_client.models.com.atproto.label.query_labels.rst
new file mode 100644
index 00000000..9125c041
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.label.query_labels.rst
@@ -0,0 +1,7 @@
+com.atproto.label.query\_labels
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.label.query_labels
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.label.rst b/docs/source/atproto/atproto_client.models.com.atproto.label.rst
new file mode 100644
index 00000000..d463f993
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.label.rst
@@ -0,0 +1,17 @@
+com.atproto.label
+========================================
+
+.. automodule:: atproto_client.models.com.atproto.label
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.label.defs
+   atproto_client.models.com.atproto.label.query_labels
+   atproto_client.models.com.atproto.label.subscribe_labels
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.label.subscribe_labels.rst b/docs/source/atproto/atproto_client.models.com.atproto.label.subscribe_labels.rst
new file mode 100644
index 00000000..7d8f4549
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.label.subscribe_labels.rst
@@ -0,0 +1,7 @@
+com.atproto.label.subscribe\_labels
+==========================================================
+
+.. automodule:: atproto_client.models.com.atproto.label.subscribe_labels
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_blocks.rst b/docs/source/atproto/atproto_client.models.com.atproto.moderation.create_report.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_blocks.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.moderation.create_report.rst
index b3287869..663249cc 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_list_blocks.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.moderation.create_report.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_list\_blocks
+com.atproto.moderation.create\_report
 ============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_list_blocks
+.. automodule:: atproto_client.models.com.atproto.moderation.create_report
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.defs.rst b/docs/source/atproto/atproto_client.models.com.atproto.moderation.defs.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.defs.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.moderation.defs.rst
index 571745d2..bdb1b45c 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.admin.defs.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.moderation.defs.rst
@@ -1,7 +1,7 @@
-com.atproto.admin.defs
+com.atproto.moderation.defs
 ==================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.admin.defs
+.. automodule:: atproto_client.models.com.atproto.moderation.defs
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.moderation.rst b/docs/source/atproto/atproto_client.models.com.atproto.moderation.rst
new file mode 100644
index 00000000..00eeb5dd
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.moderation.rst
@@ -0,0 +1,16 @@
+com.atproto.moderation
+=============================================
+
+.. automodule:: atproto_client.models.com.atproto.moderation
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.moderation.create_report
+   atproto_client.models.com.atproto.moderation.defs
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_mutes.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.apply_writes.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_mutes.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.repo.apply_writes.rst
index 0a0f4c9f..d075d6ec 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_mutes.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.apply_writes.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_mutes
+com.atproto.repo.apply\_writes
 =====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_mutes
+.. automodule:: atproto_client.models.com.atproto.repo.apply_writes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.repo.create_record.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.create_record.rst
new file mode 100644
index 00000000..61f4b3c2
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.create_record.rst
@@ -0,0 +1,7 @@
+com.atproto.repo.create\_record
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.repo.create_record
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.repo.delete_record.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.delete_record.rst
new file mode 100644
index 00000000..17171d9e
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.delete_record.rst
@@ -0,0 +1,7 @@
+com.atproto.repo.delete\_record
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.repo.delete_record
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_repo.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.describe_repo.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_repo.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.repo.describe_repo.rst
index fe349f97..f07e879e 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.get_repo.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.describe_repo.rst
@@ -1,7 +1,7 @@
-com.atproto.sync.get\_repo
+com.atproto.repo.describe\_repo
 ======================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.get_repo
+.. automodule:: atproto_client.models.com.atproto.repo.describe_repo
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.get_record.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.repo.get_record.rst
index 3295f32e..fc343d42 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.get_feed.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.get_record.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.get\_feed
+com.atproto.repo.get\_record
 ===================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.get_feed
+.. automodule:: atproto_client.models.com.atproto.repo.get_record
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_lists.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.list_records.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_lists.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.repo.list_records.rst
index c9454b22..2630614d 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.get_lists.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.list_records.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.get\_lists
+com.atproto.repo.list\_records
 =====================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.get_lists
+.. automodule:: atproto_client.models.com.atproto.repo.list_records
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.generator.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.put_record.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.generator.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.repo.put_record.rst
index ec84b732..f5875ccc 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.generator.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.put_record.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.generator
+com.atproto.repo.put\_record
 ===================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.generator
+.. automodule:: atproto_client.models.com.atproto.repo.put_record
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.repo.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.rst
new file mode 100644
index 00000000..2003f815
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.rst
@@ -0,0 +1,23 @@
+com.atproto.repo
+=======================================
+
+.. automodule:: atproto_client.models.com.atproto.repo
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.repo.apply_writes
+   atproto_client.models.com.atproto.repo.create_record
+   atproto_client.models.com.atproto.repo.delete_record
+   atproto_client.models.com.atproto.repo.describe_repo
+   atproto_client.models.com.atproto.repo.get_record
+   atproto_client.models.com.atproto.repo.list_records
+   atproto_client.models.com.atproto.repo.put_record
+   atproto_client.models.com.atproto.repo.strong_ref
+   atproto_client.models.com.atproto.repo.upload_blob
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.repo.strong_ref.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.strong_ref.rst
new file mode 100644
index 00000000..d82eed75
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.strong_ref.rst
@@ -0,0 +1,7 @@
+com.atproto.repo.strong\_ref
+===================================================
+
+.. automodule:: atproto_client.models.com.atproto.repo.strong_ref
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.repo.upload_blob.rst b/docs/source/atproto/atproto_client.models.com.atproto.repo.upload_blob.rst
new file mode 100644
index 00000000..6777d79b
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.repo.upload_blob.rst
@@ -0,0 +1,7 @@
+com.atproto.repo.upload\_blob
+====================================================
+
+.. automodule:: atproto_client.models.com.atproto.repo.upload_blob
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.rst b/docs/source/atproto/atproto_client.models.com.atproto.rst
new file mode 100644
index 00000000..918ffe54
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.rst
@@ -0,0 +1,22 @@
+com.atproto
+==================================
+
+.. automodule:: atproto_client.models.com.atproto
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.admin
+   atproto_client.models.com.atproto.identity
+   atproto_client.models.com.atproto.label
+   atproto_client.models.com.atproto.moderation
+   atproto_client.models.com.atproto.repo
+   atproto_client.models.com.atproto.server
+   atproto_client.models.com.atproto.sync
+   atproto_client.models.com.atproto.temp
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.get_record.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.confirm_email.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.get_record.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.confirm_email.rst
index 76bfb334..3096d58d 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.get_record.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.confirm_email.rst
@@ -1,7 +1,7 @@
-com.atproto.repo.get\_record
+com.atproto.server.confirm\_email
 ========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.get_record
+.. automodule:: atproto_client.models.com.atproto.server.confirm_email
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.create_account.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.create_account.rst
new file mode 100644
index 00000000..5c9a27be
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.create_account.rst
@@ -0,0 +1,7 @@
+com.atproto.server.create\_account
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.create_account
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.create_app_password.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.create_app_password.rst
new file mode 100644
index 00000000..14867d97
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.create_app_password.rst
@@ -0,0 +1,7 @@
+com.atproto.server.create\_app\_password
+===============================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.create_app_password
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record_with_media.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_code.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record_with_media.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_code.rst
index 187e674e..9b138a8a 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.embed.record_with_media.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_code.rst
@@ -1,7 +1,7 @@
-app.bsky.embed.record\_with\_media
+com.atproto.server.create\_invite\_code
 ==============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.embed.record_with_media
+.. automodule:: atproto_client.models.com.atproto.server.create_invite_code
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_codes.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_codes.rst
new file mode 100644
index 00000000..07d0afde
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.create_invite_codes.rst
@@ -0,0 +1,7 @@
+com.atproto.server.create\_invite\_codes
+===============================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.create_invite_codes
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.create_session.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.create_session.rst
new file mode 100644
index 00000000..90e6709c
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.create_session.rst
@@ -0,0 +1,7 @@
+com.atproto.server.create\_session
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.create_session
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.defs.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.defs.rst
new file mode 100644
index 00000000..8716d6c3
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.defs.rst
@@ -0,0 +1,7 @@
+com.atproto.server.defs
+==============================================
+
+.. automodule:: atproto_client.models.com.atproto.server.defs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.delete_account.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.delete_account.rst
new file mode 100644
index 00000000..8f8e6c82
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.delete_account.rst
@@ -0,0 +1,7 @@
+com.atproto.server.delete\_account
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.delete_account
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.delete_session.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.delete_session.rst
new file mode 100644
index 00000000..a35f070f
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.delete_session.rst
@@ -0,0 +1,7 @@
+com.atproto.server.delete\_session
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.delete_session
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.describe_server.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.describe_server.rst
new file mode 100644
index 00000000..453fdc94
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.describe_server.rst
@@ -0,0 +1,7 @@
+com.atproto.server.describe\_server
+==========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.describe_server
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.get_account_invite_codes.rst
similarity index 62%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.get_account_invite_codes.rst
index ecd60406..223337c9 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.get_account_invite_codes.rst
@@ -1,7 +1,7 @@
 com.atproto.server.get\_account\_invite\_codes
-==========================================================================
+=====================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.get_account_invite_codes
+.. automodule:: atproto_client.models.com.atproto.server.get_account_invite_codes
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.get_session.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.get_session.rst
new file mode 100644
index 00000000..070512b8
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.get_session.rst
@@ -0,0 +1,7 @@
+com.atproto.server.get\_session
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.get_session
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.list_app_passwords.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.list_app_passwords.rst
index 21ee25f1..924dd1a5 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.list_app_passwords.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.unmute\_actor\_list
+com.atproto.server.list\_app\_passwords
 ==============================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.unmute_actor_list
+.. automodule:: atproto_client.models.com.atproto.server.list_app_passwords
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.refresh_session.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.refresh_session.rst
new file mode 100644
index 00000000..1db23b93
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.refresh_session.rst
@@ -0,0 +1,7 @@
+com.atproto.server.refresh\_session
+==========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.refresh_session
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_account_delete.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.request_account_delete.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_account_delete.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.request_account_delete.rst
index 082bb6de..59149bad 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_account_delete.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.request_account_delete.rst
@@ -1,7 +1,7 @@
 com.atproto.server.request\_account\_delete
-=======================================================================
+==================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.request_account_delete
+.. automodule:: atproto_client.models.com.atproto.server.request_account_delete
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_confirmation.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.request_email_confirmation.rst
similarity index 62%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_confirmation.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.request_email_confirmation.rst
index fcafe3fe..6c48324b 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_confirmation.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.request_email_confirmation.rst
@@ -1,7 +1,7 @@
 com.atproto.server.request\_email\_confirmation
-===========================================================================
+======================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.request_email_confirmation
+.. automodule:: atproto_client.models.com.atproto.server.request_email_confirmation
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_update.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.request_email_update.rst
similarity index 64%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_update.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.request_email_update.rst
index 04051d01..8622b8f2 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_email_update.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.request_email_update.rst
@@ -1,7 +1,7 @@
 com.atproto.server.request\_email\_update
-=====================================================================
+================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.request_email_update
+.. automodule:: atproto_client.models.com.atproto.server.request_email_update
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_password_reset.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.request_password_reset.rst
similarity index 63%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_password_reset.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.request_password_reset.rst
index db65fea2..9dd78e0d 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.server.request_password_reset.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.request_password_reset.rst
@@ -1,7 +1,7 @@
 com.atproto.server.request\_password\_reset
-=======================================================================
+==================================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.server.request_password_reset
+.. automodule:: atproto_client.models.com.atproto.server.request_password_reset
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.reserve_signing_key.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.reserve_signing_key.rst
new file mode 100644
index 00000000..5376233a
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.reserve_signing_key.rst
@@ -0,0 +1,7 @@
+com.atproto.server.reserve\_signing\_key
+===============================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.reserve_signing_key
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.reset_password.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.reset_password.rst
new file mode 100644
index 00000000..8bea8d2a
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.reset_password.rst
@@ -0,0 +1,7 @@
+com.atproto.server.reset\_password
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.reset_password
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.revoke_app_password.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.revoke_app_password.rst
new file mode 100644
index 00000000..3aa4fe75
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.revoke_app_password.rst
@@ -0,0 +1,7 @@
+com.atproto.server.revoke\_app\_password
+===============================================================
+
+.. automodule:: atproto_client.models.com.atproto.server.revoke_app_password
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.server.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.rst
new file mode 100644
index 00000000..5d156e25
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.rst
@@ -0,0 +1,36 @@
+com.atproto.server
+=========================================
+
+.. automodule:: atproto_client.models.com.atproto.server
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.server.confirm_email
+   atproto_client.models.com.atproto.server.create_account
+   atproto_client.models.com.atproto.server.create_app_password
+   atproto_client.models.com.atproto.server.create_invite_code
+   atproto_client.models.com.atproto.server.create_invite_codes
+   atproto_client.models.com.atproto.server.create_session
+   atproto_client.models.com.atproto.server.defs
+   atproto_client.models.com.atproto.server.delete_account
+   atproto_client.models.com.atproto.server.delete_session
+   atproto_client.models.com.atproto.server.describe_server
+   atproto_client.models.com.atproto.server.get_account_invite_codes
+   atproto_client.models.com.atproto.server.get_session
+   atproto_client.models.com.atproto.server.list_app_passwords
+   atproto_client.models.com.atproto.server.refresh_session
+   atproto_client.models.com.atproto.server.request_account_delete
+   atproto_client.models.com.atproto.server.request_email_confirmation
+   atproto_client.models.com.atproto.server.request_email_update
+   atproto_client.models.com.atproto.server.request_password_reset
+   atproto_client.models.com.atproto.server.reserve_signing_key
+   atproto_client.models.com.atproto.server.reset_password
+   atproto_client.models.com.atproto.server.revoke_app_password
+   atproto_client.models.com.atproto.server.update_email
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.search_posts.rst b/docs/source/atproto/atproto_client.models.com.atproto.server.update_email.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.search_posts.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.server.update_email.rst
index 0ccd4c50..814dc879 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.feed.search_posts.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.server.update_email.rst
@@ -1,7 +1,7 @@
-app.bsky.feed.search\_posts
+com.atproto.server.update\_email
 =======================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.feed.search_posts
+.. automodule:: atproto_client.models.com.atproto.server.update_email
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.follow.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_blob.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.follow.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.sync.get_blob.rst
index 634a2015..5d4f7bf3 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.graph.follow.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_blob.rst
@@ -1,7 +1,7 @@
-app.bsky.graph.follow
+com.atproto.sync.get\_blob
 =================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.graph.follow
+.. automodule:: atproto_client.models.com.atproto.sync.get_blob
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.get_blocks.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_blocks.rst
new file mode 100644
index 00000000..5028b833
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_blocks.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.get\_blocks
+===================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.get_blocks
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.get_checkout.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_checkout.rst
new file mode 100644
index 00000000..3a7d9072
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_checkout.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.get\_checkout
+=====================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.get_checkout
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.get_head.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_head.rst
new file mode 100644
index 00000000..869e3b7d
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_head.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.get\_head
+=================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.get_head
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.put_preferences.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_latest_commit.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.put_preferences.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.sync.get_latest_commit.rst
index 7a70015c..eb9ca5c0 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.app.bsky.actor.put_preferences.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_latest_commit.rst
@@ -1,7 +1,7 @@
-app.bsky.actor.put\_preferences
+com.atproto.sync.get\_latest\_commit
 ===========================================================
 
-.. automodule:: atproto.xrpc_client.models.app.bsky.actor.put_preferences
+.. automodule:: atproto_client.models.com.atproto.sync.get_latest_commit
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.get_record.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_record.rst
new file mode 100644
index 00000000..94db70da
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_record.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.get\_record
+===================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.get_record
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.get_repo.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_repo.rst
new file mode 100644
index 00000000..236978a5
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.get_repo.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.get\_repo
+=================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.get_repo
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.list_blobs.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.list_blobs.rst
new file mode 100644
index 00000000..115ea86a
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.list_blobs.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.list\_blobs
+===================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.list_blobs
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.list_repos.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.list_repos.rst
new file mode 100644
index 00000000..7e6ef8d1
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.list_repos.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.list\_repos
+===================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.list_repos
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.list_records.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.notify_of_update.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.list_records.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.sync.notify_of_update.rst
index 2a952160..6ed8a2f9 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.repo.list_records.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.notify_of_update.rst
@@ -1,7 +1,7 @@
-com.atproto.repo.list\_records
+com.atproto.sync.notify\_of\_update
 ==========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.repo.list_records
+.. automodule:: atproto_client.models.com.atproto.sync.notify_of_update
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.request_crawl.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.request_crawl.rst
new file mode 100644
index 00000000..4d5087b8
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.request_crawl.rst
@@ -0,0 +1,7 @@
+com.atproto.sync.request\_crawl
+======================================================
+
+.. automodule:: atproto_client.models.com.atproto.sync.request_crawl
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.sync.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.rst
new file mode 100644
index 00000000..7ffa5986
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.rst
@@ -0,0 +1,26 @@
+com.atproto.sync
+=======================================
+
+.. automodule:: atproto_client.models.com.atproto.sync
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.sync.get_blob
+   atproto_client.models.com.atproto.sync.get_blocks
+   atproto_client.models.com.atproto.sync.get_checkout
+   atproto_client.models.com.atproto.sync.get_head
+   atproto_client.models.com.atproto.sync.get_latest_commit
+   atproto_client.models.com.atproto.sync.get_record
+   atproto_client.models.com.atproto.sync.get_repo
+   atproto_client.models.com.atproto.sync.list_blobs
+   atproto_client.models.com.atproto.sync.list_repos
+   atproto_client.models.com.atproto.sync.notify_of_update
+   atproto_client.models.com.atproto.sync.request_crawl
+   atproto_client.models.com.atproto.sync.subscribe_repos
diff --git a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_repos.rst b/docs/source/atproto/atproto_client.models.com.atproto.sync.subscribe_repos.rst
similarity index 54%
rename from docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_repos.rst
rename to docs/source/atproto/atproto_client.models.com.atproto.sync.subscribe_repos.rst
index b507a8c1..a500c678 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.com.atproto.sync.list_repos.rst
+++ b/docs/source/atproto/atproto_client.models.com.atproto.sync.subscribe_repos.rst
@@ -1,7 +1,7 @@
-com.atproto.sync.list\_repos
+com.atproto.sync.subscribe\_repos
 ========================================================
 
-.. automodule:: atproto.xrpc_client.models.com.atproto.sync.list_repos
+.. automodule:: atproto_client.models.com.atproto.sync.subscribe_repos
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.temp.fetch_labels.rst b/docs/source/atproto/atproto_client.models.com.atproto.temp.fetch_labels.rst
new file mode 100644
index 00000000..b3a64872
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.temp.fetch_labels.rst
@@ -0,0 +1,7 @@
+com.atproto.temp.fetch\_labels
+=====================================================
+
+.. automodule:: atproto_client.models.com.atproto.temp.fetch_labels
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.temp.import_repo.rst b/docs/source/atproto/atproto_client.models.com.atproto.temp.import_repo.rst
new file mode 100644
index 00000000..4316d07f
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.temp.import_repo.rst
@@ -0,0 +1,7 @@
+com.atproto.temp.import\_repo
+====================================================
+
+.. automodule:: atproto_client.models.com.atproto.temp.import_repo
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.temp.push_blob.rst b/docs/source/atproto/atproto_client.models.com.atproto.temp.push_blob.rst
new file mode 100644
index 00000000..81ad6c2b
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.temp.push_blob.rst
@@ -0,0 +1,7 @@
+com.atproto.temp.push\_blob
+==================================================
+
+.. automodule:: atproto_client.models.com.atproto.temp.push_blob
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.temp.rst b/docs/source/atproto/atproto_client.models.com.atproto.temp.rst
new file mode 100644
index 00000000..01e5c1e7
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.temp.rst
@@ -0,0 +1,18 @@
+com.atproto.temp
+=======================================
+
+.. automodule:: atproto_client.models.com.atproto.temp
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto.temp.fetch_labels
+   atproto_client.models.com.atproto.temp.import_repo
+   atproto_client.models.com.atproto.temp.push_blob
+   atproto_client.models.com.atproto.temp.transfer_account
diff --git a/docs/source/atproto/atproto_client.models.com.atproto.temp.transfer_account.rst b/docs/source/atproto/atproto_client.models.com.atproto.temp.transfer_account.rst
new file mode 100644
index 00000000..c4ca68c7
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.atproto.temp.transfer_account.rst
@@ -0,0 +1,7 @@
+com.atproto.temp.transfer\_account
+=========================================================
+
+.. automodule:: atproto_client.models.com.atproto.temp.transfer_account
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.com.rst b/docs/source/atproto/atproto_client.models.com.rst
new file mode 100644
index 00000000..0303d672
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.com.rst
@@ -0,0 +1,15 @@
+com
+==========================
+
+.. automodule:: atproto_client.models.com
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.com.atproto
diff --git a/docs/source/atproto/atproto_client.models.common.rst b/docs/source/atproto/atproto_client.models.common.rst
new file mode 100644
index 00000000..03772a06
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.common.rst
@@ -0,0 +1,7 @@
+common
+=============================
+
+.. automodule:: atproto_client.models.common
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.auth.rst b/docs/source/atproto/atproto_client.models.dot_dict.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.client.auth.rst
rename to docs/source/atproto/atproto_client.models.dot_dict.rst
index b0304464..2610cf45 100644
--- a/docs/source/atproto/atproto.xrpc_client.client.auth.rst
+++ b/docs/source/atproto/atproto_client.models.dot_dict.rst
@@ -1,7 +1,7 @@
-atproto.xrpc\_client.client.auth
+dot\_dict
 ================================
 
-.. automodule:: atproto.xrpc_client.client.auth
+.. automodule:: atproto_client.models.dot_dict
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.base.rst b/docs/source/atproto/atproto_client.models.languages.rst
similarity index 51%
rename from docs/source/atproto/atproto.xrpc_client.client.base.rst
rename to docs/source/atproto/atproto_client.models.languages.rst
index a2fadf7c..723e7765 100644
--- a/docs/source/atproto/atproto.xrpc_client.client.base.rst
+++ b/docs/source/atproto/atproto_client.models.languages.rst
@@ -1,7 +1,7 @@
-atproto.xrpc\_client.client.base
+languages
 ================================
 
-.. automodule:: atproto.xrpc_client.client.base
+.. automodule:: atproto_client.models.languages
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.blob_ref.rst b/docs/source/atproto/atproto_client.models.models_loader.rst
similarity index 57%
rename from docs/source/atproto/atproto.xrpc_client.models.blob_ref.rst
rename to docs/source/atproto/atproto_client.models.models_loader.rst
index 48cad215..afdfb9b5 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.blob_ref.rst
+++ b/docs/source/atproto/atproto_client.models.models_loader.rst
@@ -1,7 +1,7 @@
-blob\_ref
+models\_loader
 =====================================
 
-.. automodule:: atproto.xrpc_client.models.blob_ref
+.. automodule:: atproto_client.models.models_loader
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.models.rst b/docs/source/atproto/atproto_client.models.rst
new file mode 100644
index 00000000..9ac23e25
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.rst
@@ -0,0 +1,32 @@
+atproto\_client.models
+======================
+
+.. automodule:: atproto_client.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.app
+   atproto_client.models.com
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.models.base
+   atproto_client.models.blob_ref
+   atproto_client.models.common
+   atproto_client.models.dot_dict
+   atproto_client.models.languages
+   atproto_client.models.models_loader
+   atproto_client.models.type_conversion
+   atproto_client.models.unknown_type
+   atproto_client.models.utils
diff --git a/docs/source/atproto/atproto_client.models.type_conversion.rst b/docs/source/atproto/atproto_client.models.type_conversion.rst
new file mode 100644
index 00000000..c050d4f0
--- /dev/null
+++ b/docs/source/atproto/atproto_client.models.type_conversion.rst
@@ -0,0 +1,7 @@
+type\_conversion
+=======================================
+
+.. automodule:: atproto_client.models.type_conversion
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.namespaces.generator.rst b/docs/source/atproto/atproto_client.models.unknown_type.rst
similarity index 50%
rename from docs/source/atproto/atproto.codegen.namespaces.generator.rst
rename to docs/source/atproto/atproto_client.models.unknown_type.rst
index 8a11acf7..6e03ea80 100644
--- a/docs/source/atproto/atproto.codegen.namespaces.generator.rst
+++ b/docs/source/atproto/atproto_client.models.unknown_type.rst
@@ -1,7 +1,7 @@
-atproto.codegen.namespaces.generator
+unknown\_type
 ====================================
 
-.. automodule:: atproto.codegen.namespaces.generator
+.. automodule:: atproto_client.models.unknown_type
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.request.rst b/docs/source/atproto/atproto_client.models.utils.rst
similarity index 53%
rename from docs/source/atproto/atproto.xrpc_client.request.rst
rename to docs/source/atproto/atproto_client.models.utils.rst
index 12f35ef3..48c586a2 100644
--- a/docs/source/atproto/atproto.xrpc_client.request.rst
+++ b/docs/source/atproto/atproto_client.models.utils.rst
@@ -1,7 +1,7 @@
-atproto.xrpc\_client.request
+utils
 ============================
 
-.. automodule:: atproto.xrpc_client.request
+.. automodule:: atproto_client.models.utils
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.namespaces.async_ns.rst b/docs/source/atproto/atproto_client.namespaces.async_ns.rst
new file mode 100644
index 00000000..29cd5601
--- /dev/null
+++ b/docs/source/atproto/atproto_client.namespaces.async_ns.rst
@@ -0,0 +1,7 @@
+atproto\_client.namespaces.async\_ns
+====================================
+
+.. automodule:: atproto_client.namespaces.async_ns
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.client.raw.rst b/docs/source/atproto/atproto_client.namespaces.base.rst
similarity index 52%
rename from docs/source/atproto/atproto.xrpc_client.client.raw.rst
rename to docs/source/atproto/atproto_client.namespaces.base.rst
index 03b1b97d..805e82c7 100644
--- a/docs/source/atproto/atproto.xrpc_client.client.raw.rst
+++ b/docs/source/atproto/atproto_client.namespaces.base.rst
@@ -1,7 +1,7 @@
-atproto.xrpc\_client.client.raw
+atproto\_client.namespaces.base
 ===============================
 
-.. automodule:: atproto.xrpc_client.client.raw
+.. automodule:: atproto_client.namespaces.base
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.namespaces.rst b/docs/source/atproto/atproto_client.namespaces.rst
new file mode 100644
index 00000000..74b7946f
--- /dev/null
+++ b/docs/source/atproto/atproto_client.namespaces.rst
@@ -0,0 +1,17 @@
+atproto\_client.namespaces
+==========================
+
+.. automodule:: atproto_client.namespaces
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.namespaces.async_ns
+   atproto_client.namespaces.base
+   atproto_client.namespaces.sync_ns
diff --git a/docs/source/atproto/atproto_client.namespaces.sync_ns.rst b/docs/source/atproto/atproto_client.namespaces.sync_ns.rst
new file mode 100644
index 00000000..5eb05485
--- /dev/null
+++ b/docs/source/atproto/atproto_client.namespaces.sync_ns.rst
@@ -0,0 +1,7 @@
+atproto\_client.namespaces.sync\_ns
+===================================
+
+.. automodule:: atproto_client.namespaces.sync_ns
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.firehose.client.rst b/docs/source/atproto/atproto_client.request.rst
similarity index 54%
rename from docs/source/atproto/atproto.firehose.client.rst
rename to docs/source/atproto/atproto_client.request.rst
index ec5b8195..925420f4 100644
--- a/docs/source/atproto/atproto.firehose.client.rst
+++ b/docs/source/atproto/atproto_client.request.rst
@@ -1,7 +1,7 @@
-atproto.firehose.client
+atproto\_client.request
 =======================
 
-.. automodule:: atproto.firehose.client
+.. automodule:: atproto_client.request
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_client.rst b/docs/source/atproto/atproto_client.rst
new file mode 100644
index 00000000..7448f789
--- /dev/null
+++ b/docs/source/atproto/atproto_client.rst
@@ -0,0 +1,27 @@
+atproto\_client
+===============
+
+.. automodule:: atproto_client
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.client
+   atproto_client.models
+   atproto_client.namespaces
+   atproto_client.utils
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.exceptions
+   atproto_client.request
diff --git a/docs/source/atproto/atproto_client.utils.rst b/docs/source/atproto/atproto_client.utils.rst
new file mode 100644
index 00000000..39f5a8d8
--- /dev/null
+++ b/docs/source/atproto/atproto_client.utils.rst
@@ -0,0 +1,15 @@
+atproto\_client.utils
+=====================
+
+.. automodule:: atproto_client.utils
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_client.utils.text_builder
diff --git a/docs/source/atproto/atproto_client.utils.text_builder.rst b/docs/source/atproto/atproto_client.utils.text_builder.rst
new file mode 100644
index 00000000..f87f4d6c
--- /dev/null
+++ b/docs/source/atproto/atproto_client.utils.text_builder.rst
@@ -0,0 +1,7 @@
+atproto\_client.utils.text\_builder
+===================================
+
+.. automodule:: atproto_client.utils.text_builder
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_codegen.clients.generate_async_client.rst b/docs/source/atproto/atproto_codegen.clients.generate_async_client.rst
new file mode 100644
index 00000000..eb375ad2
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.clients.generate_async_client.rst
@@ -0,0 +1,7 @@
+atproto\_codegen.clients.generate\_async\_client
+================================================
+
+.. automodule:: atproto_codegen.clients.generate_async_client
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_codegen.clients.rst b/docs/source/atproto/atproto_codegen.clients.rst
new file mode 100644
index 00000000..7cb12ac7
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.clients.rst
@@ -0,0 +1,15 @@
+atproto\_codegen.clients
+========================
+
+.. automodule:: atproto_codegen.clients
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_codegen.clients.generate_async_client
diff --git a/docs/source/atproto/atproto.firehose.models.rst b/docs/source/atproto/atproto_codegen.consts.rst
similarity index 54%
rename from docs/source/atproto/atproto.firehose.models.rst
rename to docs/source/atproto/atproto_codegen.consts.rst
index 5d8b2a76..09fbd968 100644
--- a/docs/source/atproto/atproto.firehose.models.rst
+++ b/docs/source/atproto/atproto_codegen.consts.rst
@@ -1,7 +1,7 @@
-atproto.firehose.models
+atproto\_codegen.consts
 =======================
 
-.. automodule:: atproto.firehose.models
+.. automodule:: atproto_codegen.consts
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_codegen.models.builder.rst b/docs/source/atproto/atproto_codegen.models.builder.rst
new file mode 100644
index 00000000..048fdb53
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.models.builder.rst
@@ -0,0 +1,7 @@
+atproto\_codegen.models.builder
+===============================
+
+.. automodule:: atproto_codegen.models.builder
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_codegen.models.generator.rst b/docs/source/atproto/atproto_codegen.models.generator.rst
new file mode 100644
index 00000000..c65005d0
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.models.generator.rst
@@ -0,0 +1,7 @@
+atproto\_codegen.models.generator
+=================================
+
+.. automodule:: atproto_codegen.models.generator
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.codegen.clients.rst b/docs/source/atproto/atproto_codegen.models.rst
similarity index 50%
rename from docs/source/atproto/atproto.codegen.clients.rst
rename to docs/source/atproto/atproto_codegen.models.rst
index de55be44..1f630dc6 100644
--- a/docs/source/atproto/atproto.codegen.clients.rst
+++ b/docs/source/atproto/atproto_codegen.models.rst
@@ -1,7 +1,7 @@
-atproto.codegen.clients
+atproto\_codegen.models
 =======================
 
-.. automodule:: atproto.codegen.clients
+.. automodule:: atproto_codegen.models
    :members:
    :undoc-members:
    :show-inheritance:
@@ -12,4 +12,5 @@ Submodules
 .. toctree::
    :maxdepth: 4
 
-   atproto.codegen.clients.generate_async_client
+   atproto_codegen.models.builder
+   atproto_codegen.models.generator
diff --git a/docs/source/atproto/atproto_codegen.namespaces.builder.rst b/docs/source/atproto/atproto_codegen.namespaces.builder.rst
new file mode 100644
index 00000000..fdb79830
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.namespaces.builder.rst
@@ -0,0 +1,7 @@
+atproto\_codegen.namespaces.builder
+===================================
+
+.. automodule:: atproto_codegen.namespaces.builder
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto.xrpc_client.models.dot_dict.rst b/docs/source/atproto/atproto_codegen.namespaces.generator.rst
similarity index 50%
rename from docs/source/atproto/atproto.xrpc_client.models.dot_dict.rst
rename to docs/source/atproto/atproto_codegen.namespaces.generator.rst
index 2ae0f9ff..3cfc4649 100644
--- a/docs/source/atproto/atproto.xrpc_client.models.dot_dict.rst
+++ b/docs/source/atproto/atproto_codegen.namespaces.generator.rst
@@ -1,7 +1,7 @@
-dot\_dict
+atproto\_codegen.namespaces.generator
 =====================================
 
-.. automodule:: atproto.xrpc_client.models.dot_dict
+.. automodule:: atproto_codegen.namespaces.generator
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_codegen.namespaces.rst b/docs/source/atproto/atproto_codegen.namespaces.rst
new file mode 100644
index 00000000..fcb9db4b
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.namespaces.rst
@@ -0,0 +1,16 @@
+atproto\_codegen.namespaces
+===========================
+
+.. automodule:: atproto_codegen.namespaces
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_codegen.namespaces.builder
+   atproto_codegen.namespaces.generator
diff --git a/docs/source/atproto/atproto_codegen.rst b/docs/source/atproto/atproto_codegen.rst
new file mode 100644
index 00000000..5ad29e98
--- /dev/null
+++ b/docs/source/atproto/atproto_codegen.rst
@@ -0,0 +1,26 @@
+atproto\_codegen
+================
+
+.. automodule:: atproto_codegen
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_codegen.clients
+   atproto_codegen.models
+   atproto_codegen.namespaces
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_codegen.consts
+   atproto_codegen.utils
diff --git a/docs/source/atproto/atproto.lexicon.parser.rst b/docs/source/atproto/atproto_codegen.utils.rst
similarity index 55%
rename from docs/source/atproto/atproto.lexicon.parser.rst
rename to docs/source/atproto/atproto_codegen.utils.rst
index 77f66e78..f590d5fe 100644
--- a/docs/source/atproto/atproto.lexicon.parser.rst
+++ b/docs/source/atproto/atproto_codegen.utils.rst
@@ -1,7 +1,7 @@
-atproto.lexicon.parser
+atproto\_codegen.utils
 ======================
 
-.. automodule:: atproto.lexicon.parser
+.. automodule:: atproto_codegen.utils
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.car.car.rst b/docs/source/atproto/atproto_core.car.car.rst
new file mode 100644
index 00000000..732b5bd9
--- /dev/null
+++ b/docs/source/atproto/atproto_core.car.car.rst
@@ -0,0 +1,7 @@
+atproto\_core.car.car
+=====================
+
+.. automodule:: atproto_core.car.car
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.car.rst b/docs/source/atproto/atproto_core.car.rst
new file mode 100644
index 00000000..52f3fe5d
--- /dev/null
+++ b/docs/source/atproto/atproto_core.car.rst
@@ -0,0 +1,15 @@
+atproto\_core.car
+=================
+
+.. automodule:: atproto_core.car
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.car.car
diff --git a/docs/source/atproto/atproto_core.cbor.cbor.rst b/docs/source/atproto/atproto_core.cbor.cbor.rst
new file mode 100644
index 00000000..e6888605
--- /dev/null
+++ b/docs/source/atproto/atproto_core.cbor.cbor.rst
@@ -0,0 +1,7 @@
+atproto\_core.cbor.cbor
+=======================
+
+.. automodule:: atproto_core.cbor.cbor
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.cbor.rst b/docs/source/atproto/atproto_core.cbor.rst
new file mode 100644
index 00000000..0fba8617
--- /dev/null
+++ b/docs/source/atproto/atproto_core.cbor.rst
@@ -0,0 +1,15 @@
+atproto\_core.cbor
+==================
+
+.. automodule:: atproto_core.cbor
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.cbor.cbor
diff --git a/docs/source/atproto/atproto_core.cid.cid.rst b/docs/source/atproto/atproto_core.cid.cid.rst
new file mode 100644
index 00000000..97620621
--- /dev/null
+++ b/docs/source/atproto/atproto_core.cid.cid.rst
@@ -0,0 +1,7 @@
+atproto\_core.cid.cid
+=====================
+
+.. automodule:: atproto_core.cid.cid
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.cid.rst b/docs/source/atproto/atproto_core.cid.rst
new file mode 100644
index 00000000..61d81c01
--- /dev/null
+++ b/docs/source/atproto/atproto_core.cid.rst
@@ -0,0 +1,15 @@
+atproto\_core.cid
+=================
+
+.. automodule:: atproto_core.cid
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.cid.cid
diff --git a/docs/source/atproto/atproto_core.exceptions.rst b/docs/source/atproto/atproto_core.exceptions.rst
new file mode 100644
index 00000000..32c19692
--- /dev/null
+++ b/docs/source/atproto/atproto_core.exceptions.rst
@@ -0,0 +1,7 @@
+atproto\_core.exceptions
+========================
+
+.. automodule:: atproto_core.exceptions
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.nsid.nsid.rst b/docs/source/atproto/atproto_core.nsid.nsid.rst
new file mode 100644
index 00000000..bc1e9153
--- /dev/null
+++ b/docs/source/atproto/atproto_core.nsid.nsid.rst
@@ -0,0 +1,7 @@
+atproto\_core.nsid.nsid
+=======================
+
+.. automodule:: atproto_core.nsid.nsid
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_core.nsid.rst b/docs/source/atproto/atproto_core.nsid.rst
new file mode 100644
index 00000000..b179aca6
--- /dev/null
+++ b/docs/source/atproto/atproto_core.nsid.rst
@@ -0,0 +1,15 @@
+atproto\_core.nsid
+==================
+
+.. automodule:: atproto_core.nsid
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.nsid.nsid
diff --git a/docs/source/atproto/atproto_core.rst b/docs/source/atproto/atproto_core.rst
new file mode 100644
index 00000000..2e622816
--- /dev/null
+++ b/docs/source/atproto/atproto_core.rst
@@ -0,0 +1,27 @@
+atproto\_core
+=============
+
+.. automodule:: atproto_core
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.car
+   atproto_core.cbor
+   atproto_core.cid
+   atproto_core.nsid
+   atproto_core.uri
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.exceptions
diff --git a/docs/source/atproto/atproto_core.uri.rst b/docs/source/atproto/atproto_core.uri.rst
new file mode 100644
index 00000000..4d6c0410
--- /dev/null
+++ b/docs/source/atproto/atproto_core.uri.rst
@@ -0,0 +1,15 @@
+atproto\_core.uri
+=================
+
+.. automodule:: atproto_core.uri
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_core.uri.uri
diff --git a/docs/source/atproto/atproto_core.uri.uri.rst b/docs/source/atproto/atproto_core.uri.uri.rst
new file mode 100644
index 00000000..5378b8e0
--- /dev/null
+++ b/docs/source/atproto/atproto_core.uri.uri.rst
@@ -0,0 +1,7 @@
+atproto\_core.uri.uri
+=====================
+
+.. automodule:: atproto_core.uri.uri
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_firehose.client.rst b/docs/source/atproto/atproto_firehose.client.rst
new file mode 100644
index 00000000..a446e9fe
--- /dev/null
+++ b/docs/source/atproto/atproto_firehose.client.rst
@@ -0,0 +1,7 @@
+atproto\_firehose.client
+========================
+
+.. automodule:: atproto_firehose.client
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_firehose.exceptions.rst b/docs/source/atproto/atproto_firehose.exceptions.rst
new file mode 100644
index 00000000..54ee61eb
--- /dev/null
+++ b/docs/source/atproto/atproto_firehose.exceptions.rst
@@ -0,0 +1,7 @@
+atproto\_firehose.exceptions
+============================
+
+.. automodule:: atproto_firehose.exceptions
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_firehose.firehose.rst b/docs/source/atproto/atproto_firehose.firehose.rst
new file mode 100644
index 00000000..8cbea560
--- /dev/null
+++ b/docs/source/atproto/atproto_firehose.firehose.rst
@@ -0,0 +1,7 @@
+atproto\_firehose.firehose
+==========================
+
+.. automodule:: atproto_firehose.firehose
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_firehose.models.rst b/docs/source/atproto/atproto_firehose.models.rst
new file mode 100644
index 00000000..09c5cd9e
--- /dev/null
+++ b/docs/source/atproto/atproto_firehose.models.rst
@@ -0,0 +1,7 @@
+atproto\_firehose.models
+========================
+
+.. automodule:: atproto_firehose.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_firehose.rst b/docs/source/atproto/atproto_firehose.rst
new file mode 100644
index 00000000..869cb150
--- /dev/null
+++ b/docs/source/atproto/atproto_firehose.rst
@@ -0,0 +1,18 @@
+atproto\_firehose
+=================
+
+.. automodule:: atproto_firehose
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_firehose.client
+   atproto_firehose.exceptions
+   atproto_firehose.firehose
+   atproto_firehose.models
diff --git a/docs/source/atproto/atproto_lexicon.exceptions.rst b/docs/source/atproto/atproto_lexicon.exceptions.rst
new file mode 100644
index 00000000..947bb379
--- /dev/null
+++ b/docs/source/atproto/atproto_lexicon.exceptions.rst
@@ -0,0 +1,7 @@
+atproto\_lexicon.exceptions
+===========================
+
+.. automodule:: atproto_lexicon.exceptions
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_lexicon.models.rst b/docs/source/atproto/atproto_lexicon.models.rst
new file mode 100644
index 00000000..74931aa2
--- /dev/null
+++ b/docs/source/atproto/atproto_lexicon.models.rst
@@ -0,0 +1,7 @@
+atproto\_lexicon.models
+=======================
+
+.. automodule:: atproto_lexicon.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_lexicon.parser.rst b/docs/source/atproto/atproto_lexicon.parser.rst
new file mode 100644
index 00000000..0b6f6369
--- /dev/null
+++ b/docs/source/atproto/atproto_lexicon.parser.rst
@@ -0,0 +1,7 @@
+atproto\_lexicon.parser
+=======================
+
+.. automodule:: atproto_lexicon.parser
+   :members:
+   :undoc-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/atproto/atproto_lexicon.rst b/docs/source/atproto/atproto_lexicon.rst
new file mode 100644
index 00000000..52e851e3
--- /dev/null
+++ b/docs/source/atproto/atproto_lexicon.rst
@@ -0,0 +1,17 @@
+atproto\_lexicon
+================
+
+.. automodule:: atproto_lexicon
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   atproto_lexicon.exceptions
+   atproto_lexicon.models
+   atproto_lexicon.parser
diff --git a/docs/source/atproto/atproto_server.rst b/docs/source/atproto/atproto_server.rst
new file mode 100644
index 00000000..1962bf6f
--- /dev/null
+++ b/docs/source/atproto/atproto_server.rst
@@ -0,0 +1,7 @@
+atproto\_server
+===============
+
+.. automodule:: atproto_server
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/atproto/modules.rst b/docs/source/atproto/modules.rst
index b38a26d6..3af87386 100644
--- a/docs/source/atproto/modules.rst
+++ b/docs/source/atproto/modules.rst
@@ -1,7 +1,14 @@
-atproto
-=======
+packages
+========
 
 .. toctree::
    :maxdepth: 4
 
    atproto
+   atproto_cli
+   atproto_client
+   atproto_codegen
+   atproto_core
+   atproto_firehose
+   atproto_lexicon
+   atproto_server
diff --git a/docs/source/xrpc_clients/base.rst b/docs/source/atproto_client/base.rst
similarity index 62%
rename from docs/source/xrpc_clients/base.rst
rename to docs/source/atproto_client/base.rst
index a39a6eca..78b25974 100644
--- a/docs/source/xrpc_clients/base.rst
+++ b/docs/source/atproto_client/base.rst
@@ -1,7 +1,7 @@
 Base Client
 ===========
 
-.. automodule:: atproto.xrpc_client.client.base
+.. automodule:: atproto_client.client.base
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/xrpc_clients/client.rst b/docs/source/atproto_client/client.rst
similarity index 64%
rename from docs/source/xrpc_clients/client.rst
rename to docs/source/atproto_client/client.rst
index 7bf6bdba..3fc29246 100644
--- a/docs/source/xrpc_clients/client.rst
+++ b/docs/source/atproto_client/client.rst
@@ -1,7 +1,7 @@
 Client
 ======
 
-.. automodule:: atproto.xrpc_client.client.client
+.. automodule:: atproto_client.client.client
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/xrpc_clients/clients.rst b/docs/source/atproto_client/clients.rst
similarity index 79%
rename from docs/source/xrpc_clients/clients.rst
rename to docs/source/atproto_client/clients.rst
index 68e122a2..f345eff5 100644
--- a/docs/source/xrpc_clients/clients.rst
+++ b/docs/source/atproto_client/clients.rst
@@ -1,7 +1,7 @@
 XRPC Clients
 ============
 
-.. automodule:: atproto.xrpc_client.client
+.. automodule:: atproto_client.client
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/xrpc_clients/http.rst b/docs/source/atproto_client/http.rst
similarity index 64%
rename from docs/source/xrpc_clients/http.rst
rename to docs/source/atproto_client/http.rst
index 80eefade..09a68dad 100644
--- a/docs/source/xrpc_clients/http.rst
+++ b/docs/source/atproto_client/http.rst
@@ -1,7 +1,7 @@
 HTTP Client
 ===========
 
-.. automodule:: atproto.xrpc_client.request
+.. automodule:: atproto_client.request
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/xrpc_clients/raw.rst b/docs/source/atproto_client/raw.rst
similarity index 62%
rename from docs/source/xrpc_clients/raw.rst
rename to docs/source/atproto_client/raw.rst
index c00a34c4..46d5588c 100644
--- a/docs/source/xrpc_clients/raw.rst
+++ b/docs/source/atproto_client/raw.rst
@@ -1,7 +1,7 @@
 Raw Client
 ==========
 
-.. automodule:: atproto.xrpc_client.client.raw
+.. automodule:: atproto_client.client.raw
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/car.rst b/docs/source/car.rst
index 99859718..07b4c563 100644
--- a/docs/source/car.rst
+++ b/docs/source/car.rst
@@ -7,7 +7,7 @@ The CAR format is intended as a serialized representation of any IPLD DAG (graph
 
 Specification for v1: https://ipld.io/specs/transport/car/carv1/
 
-.. automodule:: atproto.car
+.. automodule:: atproto_core.car
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/cbor.rst b/docs/source/cbor.rst
index cb5fc4a7..c07253d3 100644
--- a/docs/source/cbor.rst
+++ b/docs/source/cbor.rst
@@ -7,7 +7,7 @@ More info: https://ipld.io/docs/codecs/known/dag-cbor/
 
 About CBOR: https://en.wikipedia.org/wiki/CBOR
 
-.. automodule:: atproto.cbor
+.. automodule:: atproto_core.cbor
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/cid.rst b/docs/source/cid.rst
index f972132d..4a249885 100644
--- a/docs/source/cid.rst
+++ b/docs/source/cid.rst
@@ -1,7 +1,7 @@
 CID decoder
 ===========
 
-.. autoclass:: atproto.cid.CID
+.. autoclass:: atproto_core.cid.CID
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 22fa7741..bd6c9abd 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -19,7 +19,7 @@
 if t.TYPE_CHECKING:
     from sphinx.application import Sphinx
 
-sys.path.insert(0, os.path.abspath('../..'))
+sys.path.insert(0, os.path.abspath('../../packages'))
 
 master_doc = 'index'
 
diff --git a/docs/source/firehose.models.rst b/docs/source/firehose.models.rst
index d8201e5e..b5a0ebfd 100644
--- a/docs/source/firehose.models.rst
+++ b/docs/source/firehose.models.rst
@@ -1,7 +1,7 @@
 Frame models
 ============
 
-.. automodule:: atproto.firehose.models
+.. automodule:: atproto_firehose.models
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/firehose.rst b/docs/source/firehose.rst
index fb2bbc5a..01a168ed 100644
--- a/docs/source/firehose.rst
+++ b/docs/source/firehose.rst
@@ -7,7 +7,7 @@ All clients present in two variants: sync and async. As a developer, you should
 
 ..  code-block:: python
 
-    from atproto.firehose import FirehoseSubscribeReposClient, parse_subscribe_repos_message
+    from atproto_firehose import FirehoseSubscribeReposClient, parse_subscribe_repos_message
 
     client = FirehoseSubscribeReposClient()
 
@@ -37,7 +37,7 @@ By default :obj:`parse_subscribe_repos_message` and :obj:`parse_subscribe_labels
 
         car = CAR.from_bytes(commit.blocks)
 
-.. automodule:: atproto.firehose
+.. automodule:: atproto_firehose
    :members:
    :undoc-members:
    :inherited-members:
@@ -48,4 +48,4 @@ Submodules
 .. toctree::
    :maxdepth: 4
 
-   firehose.models
+   atproto_firehose.models
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 7b77b248..1372fc49 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -19,7 +19,7 @@ Documentation
    :maxdepth: 4
 
    firehose
-   xrpc_clients/clients
+   atproto_client/clients
    namespace
    models
 
diff --git a/docs/source/models.rst b/docs/source/models.rst
index f3395db0..e21cc067 100644
--- a/docs/source/models.rst
+++ b/docs/source/models.rst
@@ -1,7 +1,7 @@
 Models
 ======
 
-.. automodule:: atproto.xrpc_client.models
+.. automodule:: atproto_client.models
    :members:
    :undoc-members:
    :show-inheritance:
@@ -12,10 +12,10 @@ Submodules
 .. toctree::
    :maxdepth: 4
 
-   ../atproto/atproto.xrpc_client.models.base
-   ../atproto/atproto.xrpc_client.models.app
-   ../atproto/atproto.xrpc_client.models.com
-   ../atproto/atproto.xrpc_client.models.languages
-   ../atproto/atproto.xrpc_client.models.blob_ref
-   ../atproto/atproto.xrpc_client.models.dot_dict
-   ../atproto/atproto.xrpc_client.models.utils
+   ../atproto/atproto_client.models.base
+   ../atproto/atproto_client.models.app
+   ../atproto/atproto_client.models.com
+   ../atproto/atproto_client.models.languages
+   ../atproto/atproto_client.models.blob_ref
+   ../atproto/atproto_client.models.dot_dict
+   ../atproto/atproto_client.models.utils
diff --git a/docs/source/namespace.rst b/docs/source/namespace.rst
index cadc2bba..d053618b 100644
--- a/docs/source/namespace.rst
+++ b/docs/source/namespace.rst
@@ -1,7 +1,7 @@
 Namespace
 =========
 
-.. automodule:: atproto.xrpc_client.namespaces.sync_ns
+.. automodule:: atproto_client.namespaces.sync_ns
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/nsid.rst b/docs/source/nsid.rst
index 4db0a7f1..84996375 100644
--- a/docs/source/nsid.rst
+++ b/docs/source/nsid.rst
@@ -7,7 +7,7 @@ NSIDs use Reverse Domain-Name Notation with the additional constraint that the s
 
 More info: https://atproto.com/specs/nsid
 
-.. automodule:: atproto.nsid
+.. automodule:: atproto_core.nsid
    :members:
    :undoc-members:
    :show-inheritance:
\ No newline at end of file
diff --git a/docs/source/text_builder.rst b/docs/source/text_builder.rst
index 6af887b7..c8203806 100644
--- a/docs/source/text_builder.rst
+++ b/docs/source/text_builder.rst
@@ -1,7 +1,7 @@
 Text Builder (rich text)
 ========================
 
-.. automodule:: atproto.utils.text_builder
+.. automodule:: atproto_client.utils.text_builder
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/source/uri.rst b/docs/source/uri.rst
index e1b33e3f..b59185c8 100644
--- a/docs/source/uri.rst
+++ b/docs/source/uri.rst
@@ -3,7 +3,7 @@ AT URI Scheme
 
 More info: https://atproto.com/specs/at-uri-scheme
 
-.. automodule:: atproto.uri
+.. automodule:: atproto_core.uri
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/packages/atproto/__init__.py b/packages/atproto/__init__.py
new file mode 100644
index 00000000..34812d63
--- /dev/null
+++ b/packages/atproto/__init__.py
@@ -0,0 +1,34 @@
+from atproto_client import AsyncClient, Client, models
+from atproto_core.car import CAR
+from atproto_core.cid import CID, CIDType
+from atproto_core.nsid import NSID
+from atproto_core.uri import AtUri
+from atproto_firehose import (
+    AsyncFirehoseSubscribeLabelsClient,
+    AsyncFirehoseSubscribeReposClient,
+    FirehoseSubscribeLabelsClient,
+    FirehoseSubscribeReposClient,
+    parse_subscribe_labels_message,
+    parse_subscribe_repos_message,
+)
+from atproto_firehose import models as firehose_models
+
+__version__ = '0.0.0'  # placeholder. Dynamic version from Git Tag
+__all__ = [
+    '__version__',
+    'AsyncClient',
+    'Client',
+    'models',
+    'CAR',
+    'CID',
+    'CIDType',
+    'NSID',
+    'AtUri',
+    'AsyncFirehoseSubscribeLabelsClient',
+    'AsyncFirehoseSubscribeReposClient',
+    'FirehoseSubscribeLabelsClient',
+    'FirehoseSubscribeReposClient',
+    'parse_subscribe_labels_message',
+    'parse_subscribe_repos_message',
+    'firehose_models',
+]
diff --git a/packages/atproto/exceptions.py b/packages/atproto/exceptions.py
new file mode 100644
index 00000000..cb0c5681
--- /dev/null
+++ b/packages/atproto/exceptions.py
@@ -0,0 +1,4 @@
+from atproto_client.exceptions import *
+from atproto_core.exceptions import *
+from atproto_firehose.exceptions import *
+from atproto_lexicon.exceptions import *
diff --git a/packages/atproto_cli/__init__.py b/packages/atproto_cli/__init__.py
new file mode 100644
index 00000000..41230a89
--- /dev/null
+++ b/packages/atproto_cli/__init__.py
@@ -0,0 +1,3 @@
+from .cli import atproto_cli
+
+__all__ = ['atproto_cli']
diff --git a/atproto/cli/__init__.py b/packages/atproto_cli/cli.py
similarity index 93%
rename from atproto/cli/__init__.py
rename to packages/atproto_cli/cli.py
index 397005a3..2957a25c 100644
--- a/atproto/cli/__init__.py
+++ b/packages/atproto_cli/cli.py
@@ -2,11 +2,9 @@
 from pathlib import Path
 
 import click
-
-from atproto import __version__
-from atproto.codegen.clients.generate_async_client import gen_client
-from atproto.codegen.models.generator import generate_models
-from atproto.codegen.namespaces.generator import generate_namespaces
+from atproto_codegen.clients.generate_async_client import gen_client
+from atproto_codegen.models.generator import generate_models
+from atproto_codegen.namespaces.generator import generate_namespaces
 
 
 class AliasedGroup(click.Group):
@@ -40,7 +38,6 @@ def resolve_command(
 
 
 @click.group(cls=AliasedGroup)
-@click.version_option(__version__)
 @click.pass_context
 def atproto_cli(ctx: click.Context) -> None:
     """CLI of AT Protocol SDK for Python"""
diff --git a/packages/atproto_client/__init__.py b/packages/atproto_client/__init__.py
new file mode 100644
index 00000000..00b263b8
--- /dev/null
+++ b/packages/atproto_client/__init__.py
@@ -0,0 +1,9 @@
+from atproto_client import models
+from atproto_client.client.async_client import AsyncClient
+from atproto_client.client.client import Client
+
+__all__ = [
+    'AsyncClient',
+    'Client',
+    'models',
+]
diff --git a/atproto/codegen/clients/__init__.py b/packages/atproto_client/client/__init__.py
similarity index 100%
rename from atproto/codegen/clients/__init__.py
rename to packages/atproto_client/client/__init__.py
diff --git a/atproto/xrpc_client/client/async_client.py b/packages/atproto_client/client/async_client.py
similarity index 97%
rename from atproto/xrpc_client/client/async_client.py
rename to packages/atproto_client/client/async_client.py
index b47e8520..929a109a 100644
--- a/atproto/xrpc_client/client/async_client.py
+++ b/packages/atproto_client/client/async_client.py
@@ -7,17 +7,18 @@
 import typing as t
 from asyncio import Lock
 
-from atproto import AtUri
-from atproto.utils import TextBuilder
-from atproto.xrpc_client import models
-from atproto.xrpc_client.client.async_raw import AsyncClientRaw
-from atproto.xrpc_client.client.methods_mixin import SessionMethodsMixin, TimeMethodsMixin
-from atproto.xrpc_client.models import ids
-from atproto.xrpc_client.models.languages import DEFAULT_LANGUAGE_CODE1
+from atproto_core.uri import AtUri
+
+from atproto_client import models
+from atproto_client.client.async_raw import AsyncClientRaw
+from atproto_client.client.methods_mixin import SessionMethodsMixin, TimeMethodsMixin
+from atproto_client.models import ids
+from atproto_client.models.languages import DEFAULT_LANGUAGE_CODE1
+from atproto_client.utils import TextBuilder
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.client.base import InvokeType
-    from atproto.xrpc_client.request import Response
+    from atproto_client.client.base import InvokeType
+    from atproto_client.request import Response
 
 
 class AsyncClient(SessionMethodsMixin, TimeMethodsMixin, AsyncClientRaw):
diff --git a/atproto/xrpc_client/client/async_raw.py b/packages/atproto_client/client/async_raw.py
similarity index 78%
rename from atproto/xrpc_client/client/async_raw.py
rename to packages/atproto_client/client/async_raw.py
index c88bd4f5..6820cc94 100644
--- a/atproto/xrpc_client/client/async_raw.py
+++ b/packages/atproto_client/client/async_raw.py
@@ -1,7 +1,7 @@
 import typing as t
 
-from atproto.xrpc_client.client.base import AsyncClientBase
-from atproto.xrpc_client.namespaces import async_ns
+from atproto_client.client.base import AsyncClientBase
+from atproto_client.namespaces import async_ns
 
 # TODO(MarshalX): This file should be autogenerated!
 
diff --git a/atproto/xrpc_client/client/auth.py b/packages/atproto_client/client/auth.py
similarity index 100%
rename from atproto/xrpc_client/client/auth.py
rename to packages/atproto_client/client/auth.py
diff --git a/atproto/xrpc_client/client/base.py b/packages/atproto_client/client/base.py
similarity index 94%
rename from atproto/xrpc_client/client/base.py
rename to packages/atproto_client/client/base.py
index 94179bc9..9e563c43 100644
--- a/atproto/xrpc_client/client/base.py
+++ b/packages/atproto_client/client/base.py
@@ -1,11 +1,11 @@
 import typing as t
 from enum import Enum
 
-from atproto.xrpc_client.models.utils import get_model_as_dict, get_model_as_json
-from atproto.xrpc_client.request import AsyncRequest, Request, Response
+from atproto_client.models.utils import get_model_as_dict, get_model_as_json
+from atproto_client.request import AsyncRequest, Request, Response
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.base import DataModelBase, ParamsModelBase
+    from atproto_client.models.base import DataModelBase, ParamsModelBase
 
 # TODO(MarshalX): Generate async version automatically!
 
diff --git a/atproto/xrpc_client/client/client.py b/packages/atproto_client/client/client.py
similarity index 97%
rename from atproto/xrpc_client/client/client.py
rename to packages/atproto_client/client/client.py
index ea349d12..7c3c7ffd 100644
--- a/atproto/xrpc_client/client/client.py
+++ b/packages/atproto_client/client/client.py
@@ -1,17 +1,18 @@
 import typing as t
 from threading import Lock
 
-from atproto import AtUri
-from atproto.utils import TextBuilder
-from atproto.xrpc_client import models
-from atproto.xrpc_client.client.methods_mixin import SessionMethodsMixin, TimeMethodsMixin
-from atproto.xrpc_client.client.raw import ClientRaw
-from atproto.xrpc_client.models import ids
-from atproto.xrpc_client.models.languages import DEFAULT_LANGUAGE_CODE1
+from atproto_core.uri import AtUri
+
+from atproto_client import models
+from atproto_client.client.methods_mixin import SessionMethodsMixin, TimeMethodsMixin
+from atproto_client.client.raw import ClientRaw
+from atproto_client.models import ids
+from atproto_client.models.languages import DEFAULT_LANGUAGE_CODE1
+from atproto_client.utils import TextBuilder
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.client.base import InvokeType
-    from atproto.xrpc_client.request import Response
+    from atproto_client.client.base import InvokeType
+    from atproto_client.request import Response
 
 
 class Client(SessionMethodsMixin, TimeMethodsMixin, ClientRaw):
diff --git a/atproto/xrpc_client/client/methods_mixin/__init__.py b/packages/atproto_client/client/methods_mixin/__init__.py
similarity index 100%
rename from atproto/xrpc_client/client/methods_mixin/__init__.py
rename to packages/atproto_client/client/methods_mixin/__init__.py
diff --git a/atproto/xrpc_client/client/methods_mixin/session.py b/packages/atproto_client/client/methods_mixin/session.py
similarity index 95%
rename from atproto/xrpc_client/client/methods_mixin/session.py
rename to packages/atproto_client/client/methods_mixin/session.py
index 503276bf..6073ebc8 100644
--- a/atproto/xrpc_client/client/methods_mixin/session.py
+++ b/packages/atproto_client/client/methods_mixin/session.py
@@ -4,11 +4,11 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.client.auth import get_jwt_payload
+from atproto_client.client.auth import get_jwt_payload
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.client.auth import JwtPayload
+    from atproto_client import models
+    from atproto_client.client.auth import JwtPayload
 
 
 @dataclass
diff --git a/atproto/xrpc_client/client/methods_mixin/time.py b/packages/atproto_client/client/methods_mixin/time.py
similarity index 100%
rename from atproto/xrpc_client/client/methods_mixin/time.py
rename to packages/atproto_client/client/methods_mixin/time.py
diff --git a/atproto/xrpc_client/client/raw.py b/packages/atproto_client/client/raw.py
similarity index 78%
rename from atproto/xrpc_client/client/raw.py
rename to packages/atproto_client/client/raw.py
index 70d3ef92..967a10d0 100644
--- a/atproto/xrpc_client/client/raw.py
+++ b/packages/atproto_client/client/raw.py
@@ -1,7 +1,7 @@
 import typing as t
 
-from atproto.xrpc_client.client.base import ClientBase
-from atproto.xrpc_client.namespaces import sync_ns
+from atproto_client.client.base import ClientBase
+from atproto_client.namespaces import sync_ns
 
 # TODO(MarshalX): This file should be autogenerated!
 
diff --git a/atproto/exceptions.py b/packages/atproto_client/exceptions.py
similarity index 54%
rename from atproto/exceptions.py
rename to packages/atproto_client/exceptions.py
index a54f9cbd..42963069 100644
--- a/atproto/exceptions.py
+++ b/packages/atproto_client/exceptions.py
@@ -1,19 +1,9 @@
 import typing as t
 
-if t.TYPE_CHECKING:
-    from atproto.xrpc_client.request import Response
-
-
-class AtProtocolError(Exception):
-    """Base exception"""
-
-
-class LexiconParsingError(AtProtocolError):
-    ...
+from atproto_core.exceptions import AtProtocolError
 
-
-class InvalidNsidError(AtProtocolError):
-    ...
+if t.TYPE_CHECKING:
+    from atproto_client.request import Response
 
 
 class ModelError(AtProtocolError):
@@ -47,23 +37,3 @@ class RequestException(RequestErrorBase):
 
 class BadRequestError(RequestErrorBase):
     ...
-
-
-class InvalidAtUriError(AtProtocolError):
-    ...
-
-
-class FirehoseError(AtProtocolError):
-    ...
-
-
-class FirehoseDecodingError(FirehoseError):
-    ...
-
-
-class DAGCBORDecodingError(AtProtocolError):
-    ...
-
-
-class InvalidCARFile(AtProtocolError):
-    ...
diff --git a/packages/atproto_client/models/__init__.py b/packages/atproto_client/models/__init__.py
new file mode 100644
index 00000000..cd98e44a
--- /dev/null
+++ b/packages/atproto_client/models/__init__.py
@@ -0,0 +1,297 @@
+from atproto_client.models.app.bsky.actor import defs as AppBskyActorDefs
+from atproto_client.models.app.bsky.actor import get_preferences as AppBskyActorGetPreferences
+from atproto_client.models.app.bsky.actor import get_profile as AppBskyActorGetProfile
+from atproto_client.models.app.bsky.actor import get_profiles as AppBskyActorGetProfiles
+from atproto_client.models.app.bsky.actor import get_suggestions as AppBskyActorGetSuggestions
+from atproto_client.models.app.bsky.actor import profile as AppBskyActorProfile
+from atproto_client.models.app.bsky.actor import put_preferences as AppBskyActorPutPreferences
+from atproto_client.models.app.bsky.actor import search_actors as AppBskyActorSearchActors
+from atproto_client.models.app.bsky.actor import search_actors_typeahead as AppBskyActorSearchActorsTypeahead
+from atproto_client.models.app.bsky.embed import external as AppBskyEmbedExternal
+from atproto_client.models.app.bsky.embed import images as AppBskyEmbedImages
+from atproto_client.models.app.bsky.embed import record as AppBskyEmbedRecord
+from atproto_client.models.app.bsky.embed import record_with_media as AppBskyEmbedRecordWithMedia
+from atproto_client.models.app.bsky.feed import defs as AppBskyFeedDefs
+from atproto_client.models.app.bsky.feed import describe_feed_generator as AppBskyFeedDescribeFeedGenerator
+from atproto_client.models.app.bsky.feed import generator as AppBskyFeedGenerator
+from atproto_client.models.app.bsky.feed import get_actor_feeds as AppBskyFeedGetActorFeeds
+from atproto_client.models.app.bsky.feed import get_actor_likes as AppBskyFeedGetActorLikes
+from atproto_client.models.app.bsky.feed import get_author_feed as AppBskyFeedGetAuthorFeed
+from atproto_client.models.app.bsky.feed import get_feed as AppBskyFeedGetFeed
+from atproto_client.models.app.bsky.feed import get_feed_generator as AppBskyFeedGetFeedGenerator
+from atproto_client.models.app.bsky.feed import get_feed_generators as AppBskyFeedGetFeedGenerators
+from atproto_client.models.app.bsky.feed import get_feed_skeleton as AppBskyFeedGetFeedSkeleton
+from atproto_client.models.app.bsky.feed import get_likes as AppBskyFeedGetLikes
+from atproto_client.models.app.bsky.feed import get_list_feed as AppBskyFeedGetListFeed
+from atproto_client.models.app.bsky.feed import get_post_thread as AppBskyFeedGetPostThread
+from atproto_client.models.app.bsky.feed import get_posts as AppBskyFeedGetPosts
+from atproto_client.models.app.bsky.feed import get_reposted_by as AppBskyFeedGetRepostedBy
+from atproto_client.models.app.bsky.feed import get_suggested_feeds as AppBskyFeedGetSuggestedFeeds
+from atproto_client.models.app.bsky.feed import get_timeline as AppBskyFeedGetTimeline
+from atproto_client.models.app.bsky.feed import like as AppBskyFeedLike
+from atproto_client.models.app.bsky.feed import post as AppBskyFeedPost
+from atproto_client.models.app.bsky.feed import repost as AppBskyFeedRepost
+from atproto_client.models.app.bsky.feed import search_posts as AppBskyFeedSearchPosts
+from atproto_client.models.app.bsky.feed import threadgate as AppBskyFeedThreadgate
+from atproto_client.models.app.bsky.graph import block as AppBskyGraphBlock
+from atproto_client.models.app.bsky.graph import defs as AppBskyGraphDefs
+from atproto_client.models.app.bsky.graph import follow as AppBskyGraphFollow
+from atproto_client.models.app.bsky.graph import get_blocks as AppBskyGraphGetBlocks
+from atproto_client.models.app.bsky.graph import get_followers as AppBskyGraphGetFollowers
+from atproto_client.models.app.bsky.graph import get_follows as AppBskyGraphGetFollows
+from atproto_client.models.app.bsky.graph import get_list as AppBskyGraphGetList
+from atproto_client.models.app.bsky.graph import get_list_blocks as AppBskyGraphGetListBlocks
+from atproto_client.models.app.bsky.graph import get_list_mutes as AppBskyGraphGetListMutes
+from atproto_client.models.app.bsky.graph import get_lists as AppBskyGraphGetLists
+from atproto_client.models.app.bsky.graph import get_mutes as AppBskyGraphGetMutes
+from atproto_client.models.app.bsky.graph import (
+    get_suggested_follows_by_actor as AppBskyGraphGetSuggestedFollowsByActor,
+)
+from atproto_client.models.app.bsky.graph import list as AppBskyGraphList
+from atproto_client.models.app.bsky.graph import listblock as AppBskyGraphListblock
+from atproto_client.models.app.bsky.graph import listitem as AppBskyGraphListitem
+from atproto_client.models.app.bsky.graph import mute_actor as AppBskyGraphMuteActor
+from atproto_client.models.app.bsky.graph import mute_actor_list as AppBskyGraphMuteActorList
+from atproto_client.models.app.bsky.graph import unmute_actor as AppBskyGraphUnmuteActor
+from atproto_client.models.app.bsky.graph import unmute_actor_list as AppBskyGraphUnmuteActorList
+from atproto_client.models.app.bsky.notification import get_unread_count as AppBskyNotificationGetUnreadCount
+from atproto_client.models.app.bsky.notification import list_notifications as AppBskyNotificationListNotifications
+from atproto_client.models.app.bsky.notification import register_push as AppBskyNotificationRegisterPush
+from atproto_client.models.app.bsky.notification import update_seen as AppBskyNotificationUpdateSeen
+from atproto_client.models.app.bsky.richtext import facet as AppBskyRichtextFacet
+from atproto_client.models.app.bsky.unspecced import defs as AppBskyUnspeccedDefs
+from atproto_client.models.app.bsky.unspecced import get_popular as AppBskyUnspeccedGetPopular
+from atproto_client.models.app.bsky.unspecced import (
+    get_popular_feed_generators as AppBskyUnspeccedGetPopularFeedGenerators,
+)
+from atproto_client.models.app.bsky.unspecced import get_timeline_skeleton as AppBskyUnspeccedGetTimelineSkeleton
+from atproto_client.models.app.bsky.unspecced import search_actors_skeleton as AppBskyUnspeccedSearchActorsSkeleton
+from atproto_client.models.app.bsky.unspecced import search_posts_skeleton as AppBskyUnspeccedSearchPostsSkeleton
+from atproto_client.models.com.atproto.admin import defs as ComAtprotoAdminDefs
+from atproto_client.models.com.atproto.admin import delete_account as ComAtprotoAdminDeleteAccount
+from atproto_client.models.com.atproto.admin import disable_account_invites as ComAtprotoAdminDisableAccountInvites
+from atproto_client.models.com.atproto.admin import disable_invite_codes as ComAtprotoAdminDisableInviteCodes
+from atproto_client.models.com.atproto.admin import emit_moderation_event as ComAtprotoAdminEmitModerationEvent
+from atproto_client.models.com.atproto.admin import enable_account_invites as ComAtprotoAdminEnableAccountInvites
+from atproto_client.models.com.atproto.admin import get_account_info as ComAtprotoAdminGetAccountInfo
+from atproto_client.models.com.atproto.admin import get_invite_codes as ComAtprotoAdminGetInviteCodes
+from atproto_client.models.com.atproto.admin import get_moderation_event as ComAtprotoAdminGetModerationEvent
+from atproto_client.models.com.atproto.admin import get_record as ComAtprotoAdminGetRecord
+from atproto_client.models.com.atproto.admin import get_repo as ComAtprotoAdminGetRepo
+from atproto_client.models.com.atproto.admin import get_subject_status as ComAtprotoAdminGetSubjectStatus
+from atproto_client.models.com.atproto.admin import query_moderation_events as ComAtprotoAdminQueryModerationEvents
+from atproto_client.models.com.atproto.admin import query_moderation_statuses as ComAtprotoAdminQueryModerationStatuses
+from atproto_client.models.com.atproto.admin import search_repos as ComAtprotoAdminSearchRepos
+from atproto_client.models.com.atproto.admin import send_email as ComAtprotoAdminSendEmail
+from atproto_client.models.com.atproto.admin import update_account_email as ComAtprotoAdminUpdateAccountEmail
+from atproto_client.models.com.atproto.admin import update_account_handle as ComAtprotoAdminUpdateAccountHandle
+from atproto_client.models.com.atproto.admin import update_subject_status as ComAtprotoAdminUpdateSubjectStatus
+from atproto_client.models.com.atproto.identity import resolve_handle as ComAtprotoIdentityResolveHandle
+from atproto_client.models.com.atproto.identity import update_handle as ComAtprotoIdentityUpdateHandle
+from atproto_client.models.com.atproto.label import defs as ComAtprotoLabelDefs
+from atproto_client.models.com.atproto.label import query_labels as ComAtprotoLabelQueryLabels
+from atproto_client.models.com.atproto.label import subscribe_labels as ComAtprotoLabelSubscribeLabels
+from atproto_client.models.com.atproto.moderation import create_report as ComAtprotoModerationCreateReport
+from atproto_client.models.com.atproto.moderation import defs as ComAtprotoModerationDefs
+from atproto_client.models.com.atproto.repo import apply_writes as ComAtprotoRepoApplyWrites
+from atproto_client.models.com.atproto.repo import create_record as ComAtprotoRepoCreateRecord
+from atproto_client.models.com.atproto.repo import delete_record as ComAtprotoRepoDeleteRecord
+from atproto_client.models.com.atproto.repo import describe_repo as ComAtprotoRepoDescribeRepo
+from atproto_client.models.com.atproto.repo import get_record as ComAtprotoRepoGetRecord
+from atproto_client.models.com.atproto.repo import list_records as ComAtprotoRepoListRecords
+from atproto_client.models.com.atproto.repo import put_record as ComAtprotoRepoPutRecord
+from atproto_client.models.com.atproto.repo import strong_ref as ComAtprotoRepoStrongRef
+from atproto_client.models.com.atproto.repo import upload_blob as ComAtprotoRepoUploadBlob
+from atproto_client.models.com.atproto.server import confirm_email as ComAtprotoServerConfirmEmail
+from atproto_client.models.com.atproto.server import create_account as ComAtprotoServerCreateAccount
+from atproto_client.models.com.atproto.server import create_app_password as ComAtprotoServerCreateAppPassword
+from atproto_client.models.com.atproto.server import create_invite_code as ComAtprotoServerCreateInviteCode
+from atproto_client.models.com.atproto.server import create_invite_codes as ComAtprotoServerCreateInviteCodes
+from atproto_client.models.com.atproto.server import create_session as ComAtprotoServerCreateSession
+from atproto_client.models.com.atproto.server import defs as ComAtprotoServerDefs
+from atproto_client.models.com.atproto.server import delete_account as ComAtprotoServerDeleteAccount
+from atproto_client.models.com.atproto.server import delete_session as ComAtprotoServerDeleteSession
+from atproto_client.models.com.atproto.server import describe_server as ComAtprotoServerDescribeServer
+from atproto_client.models.com.atproto.server import get_account_invite_codes as ComAtprotoServerGetAccountInviteCodes
+from atproto_client.models.com.atproto.server import get_session as ComAtprotoServerGetSession
+from atproto_client.models.com.atproto.server import list_app_passwords as ComAtprotoServerListAppPasswords
+from atproto_client.models.com.atproto.server import refresh_session as ComAtprotoServerRefreshSession
+from atproto_client.models.com.atproto.server import request_account_delete as ComAtprotoServerRequestAccountDelete
+from atproto_client.models.com.atproto.server import (
+    request_email_confirmation as ComAtprotoServerRequestEmailConfirmation,
+)
+from atproto_client.models.com.atproto.server import request_email_update as ComAtprotoServerRequestEmailUpdate
+from atproto_client.models.com.atproto.server import request_password_reset as ComAtprotoServerRequestPasswordReset
+from atproto_client.models.com.atproto.server import reserve_signing_key as ComAtprotoServerReserveSigningKey
+from atproto_client.models.com.atproto.server import reset_password as ComAtprotoServerResetPassword
+from atproto_client.models.com.atproto.server import revoke_app_password as ComAtprotoServerRevokeAppPassword
+from atproto_client.models.com.atproto.server import update_email as ComAtprotoServerUpdateEmail
+from atproto_client.models.com.atproto.sync import get_blob as ComAtprotoSyncGetBlob
+from atproto_client.models.com.atproto.sync import get_blocks as ComAtprotoSyncGetBlocks
+from atproto_client.models.com.atproto.sync import get_checkout as ComAtprotoSyncGetCheckout
+from atproto_client.models.com.atproto.sync import get_head as ComAtprotoSyncGetHead
+from atproto_client.models.com.atproto.sync import get_latest_commit as ComAtprotoSyncGetLatestCommit
+from atproto_client.models.com.atproto.sync import get_record as ComAtprotoSyncGetRecord
+from atproto_client.models.com.atproto.sync import get_repo as ComAtprotoSyncGetRepo
+from atproto_client.models.com.atproto.sync import list_blobs as ComAtprotoSyncListBlobs
+from atproto_client.models.com.atproto.sync import list_repos as ComAtprotoSyncListRepos
+from atproto_client.models.com.atproto.sync import notify_of_update as ComAtprotoSyncNotifyOfUpdate
+from atproto_client.models.com.atproto.sync import request_crawl as ComAtprotoSyncRequestCrawl
+from atproto_client.models.com.atproto.sync import subscribe_repos as ComAtprotoSyncSubscribeRepos
+from atproto_client.models.com.atproto.temp import fetch_labels as ComAtprotoTempFetchLabels
+from atproto_client.models.com.atproto.temp import import_repo as ComAtprotoTempImportRepo
+from atproto_client.models.com.atproto.temp import push_blob as ComAtprotoTempPushBlob
+from atproto_client.models.com.atproto.temp import transfer_account as ComAtprotoTempTransferAccount
+from atproto_client.models.models_loader import load_models
+from atproto_client.models.utils import (
+    create_strong_ref,
+    get_model_as_dict,
+    get_model_as_json,
+    get_or_create,
+    is_record_type,
+)
+
+
+class _Ids:
+    AppBskyActorDefs: str = 'app.bsky.actor.defs'
+    AppBskyActorGetPreferences: str = 'app.bsky.actor.getPreferences'
+    AppBskyActorGetProfile: str = 'app.bsky.actor.getProfile'
+    AppBskyActorGetProfiles: str = 'app.bsky.actor.getProfiles'
+    AppBskyActorGetSuggestions: str = 'app.bsky.actor.getSuggestions'
+    AppBskyActorProfile: str = 'app.bsky.actor.profile'
+    AppBskyActorPutPreferences: str = 'app.bsky.actor.putPreferences'
+    AppBskyActorSearchActors: str = 'app.bsky.actor.searchActors'
+    AppBskyActorSearchActorsTypeahead: str = 'app.bsky.actor.searchActorsTypeahead'
+    AppBskyEmbedExternal: str = 'app.bsky.embed.external'
+    AppBskyEmbedImages: str = 'app.bsky.embed.images'
+    AppBskyEmbedRecord: str = 'app.bsky.embed.record'
+    AppBskyEmbedRecordWithMedia: str = 'app.bsky.embed.recordWithMedia'
+    AppBskyFeedDefs: str = 'app.bsky.feed.defs'
+    AppBskyFeedDescribeFeedGenerator: str = 'app.bsky.feed.describeFeedGenerator'
+    AppBskyFeedGenerator: str = 'app.bsky.feed.generator'
+    AppBskyFeedGetActorFeeds: str = 'app.bsky.feed.getActorFeeds'
+    AppBskyFeedGetActorLikes: str = 'app.bsky.feed.getActorLikes'
+    AppBskyFeedGetAuthorFeed: str = 'app.bsky.feed.getAuthorFeed'
+    AppBskyFeedGetFeed: str = 'app.bsky.feed.getFeed'
+    AppBskyFeedGetFeedGenerator: str = 'app.bsky.feed.getFeedGenerator'
+    AppBskyFeedGetFeedGenerators: str = 'app.bsky.feed.getFeedGenerators'
+    AppBskyFeedGetFeedSkeleton: str = 'app.bsky.feed.getFeedSkeleton'
+    AppBskyFeedGetLikes: str = 'app.bsky.feed.getLikes'
+    AppBskyFeedGetListFeed: str = 'app.bsky.feed.getListFeed'
+    AppBskyFeedGetPostThread: str = 'app.bsky.feed.getPostThread'
+    AppBskyFeedGetPosts: str = 'app.bsky.feed.getPosts'
+    AppBskyFeedGetRepostedBy: str = 'app.bsky.feed.getRepostedBy'
+    AppBskyFeedGetSuggestedFeeds: str = 'app.bsky.feed.getSuggestedFeeds'
+    AppBskyFeedGetTimeline: str = 'app.bsky.feed.getTimeline'
+    AppBskyFeedLike: str = 'app.bsky.feed.like'
+    AppBskyFeedPost: str = 'app.bsky.feed.post'
+    AppBskyFeedRepost: str = 'app.bsky.feed.repost'
+    AppBskyFeedSearchPosts: str = 'app.bsky.feed.searchPosts'
+    AppBskyFeedThreadgate: str = 'app.bsky.feed.threadgate'
+    AppBskyGraphBlock: str = 'app.bsky.graph.block'
+    AppBskyGraphDefs: str = 'app.bsky.graph.defs'
+    AppBskyGraphFollow: str = 'app.bsky.graph.follow'
+    AppBskyGraphGetBlocks: str = 'app.bsky.graph.getBlocks'
+    AppBskyGraphGetFollowers: str = 'app.bsky.graph.getFollowers'
+    AppBskyGraphGetFollows: str = 'app.bsky.graph.getFollows'
+    AppBskyGraphGetList: str = 'app.bsky.graph.getList'
+    AppBskyGraphGetListBlocks: str = 'app.bsky.graph.getListBlocks'
+    AppBskyGraphGetListMutes: str = 'app.bsky.graph.getListMutes'
+    AppBskyGraphGetLists: str = 'app.bsky.graph.getLists'
+    AppBskyGraphGetMutes: str = 'app.bsky.graph.getMutes'
+    AppBskyGraphGetSuggestedFollowsByActor: str = 'app.bsky.graph.getSuggestedFollowsByActor'
+    AppBskyGraphList: str = 'app.bsky.graph.list'
+    AppBskyGraphListblock: str = 'app.bsky.graph.listblock'
+    AppBskyGraphListitem: str = 'app.bsky.graph.listitem'
+    AppBskyGraphMuteActor: str = 'app.bsky.graph.muteActor'
+    AppBskyGraphMuteActorList: str = 'app.bsky.graph.muteActorList'
+    AppBskyGraphUnmuteActor: str = 'app.bsky.graph.unmuteActor'
+    AppBskyGraphUnmuteActorList: str = 'app.bsky.graph.unmuteActorList'
+    AppBskyNotificationGetUnreadCount: str = 'app.bsky.notification.getUnreadCount'
+    AppBskyNotificationListNotifications: str = 'app.bsky.notification.listNotifications'
+    AppBskyNotificationRegisterPush: str = 'app.bsky.notification.registerPush'
+    AppBskyNotificationUpdateSeen: str = 'app.bsky.notification.updateSeen'
+    AppBskyRichtextFacet: str = 'app.bsky.richtext.facet'
+    AppBskyUnspeccedDefs: str = 'app.bsky.unspecced.defs'
+    AppBskyUnspeccedGetPopular: str = 'app.bsky.unspecced.getPopular'
+    AppBskyUnspeccedGetPopularFeedGenerators: str = 'app.bsky.unspecced.getPopularFeedGenerators'
+    AppBskyUnspeccedGetTimelineSkeleton: str = 'app.bsky.unspecced.getTimelineSkeleton'
+    AppBskyUnspeccedSearchActorsSkeleton: str = 'app.bsky.unspecced.searchActorsSkeleton'
+    AppBskyUnspeccedSearchPostsSkeleton: str = 'app.bsky.unspecced.searchPostsSkeleton'
+    ComAtprotoAdminDefs: str = 'com.atproto.admin.defs'
+    ComAtprotoAdminDeleteAccount: str = 'com.atproto.admin.deleteAccount'
+    ComAtprotoAdminDisableAccountInvites: str = 'com.atproto.admin.disableAccountInvites'
+    ComAtprotoAdminDisableInviteCodes: str = 'com.atproto.admin.disableInviteCodes'
+    ComAtprotoAdminEmitModerationEvent: str = 'com.atproto.admin.emitModerationEvent'
+    ComAtprotoAdminEnableAccountInvites: str = 'com.atproto.admin.enableAccountInvites'
+    ComAtprotoAdminGetAccountInfo: str = 'com.atproto.admin.getAccountInfo'
+    ComAtprotoAdminGetInviteCodes: str = 'com.atproto.admin.getInviteCodes'
+    ComAtprotoAdminGetModerationEvent: str = 'com.atproto.admin.getModerationEvent'
+    ComAtprotoAdminGetRecord: str = 'com.atproto.admin.getRecord'
+    ComAtprotoAdminGetRepo: str = 'com.atproto.admin.getRepo'
+    ComAtprotoAdminGetSubjectStatus: str = 'com.atproto.admin.getSubjectStatus'
+    ComAtprotoAdminQueryModerationEvents: str = 'com.atproto.admin.queryModerationEvents'
+    ComAtprotoAdminQueryModerationStatuses: str = 'com.atproto.admin.queryModerationStatuses'
+    ComAtprotoAdminSearchRepos: str = 'com.atproto.admin.searchRepos'
+    ComAtprotoAdminSendEmail: str = 'com.atproto.admin.sendEmail'
+    ComAtprotoAdminUpdateAccountEmail: str = 'com.atproto.admin.updateAccountEmail'
+    ComAtprotoAdminUpdateAccountHandle: str = 'com.atproto.admin.updateAccountHandle'
+    ComAtprotoAdminUpdateSubjectStatus: str = 'com.atproto.admin.updateSubjectStatus'
+    ComAtprotoIdentityResolveHandle: str = 'com.atproto.identity.resolveHandle'
+    ComAtprotoIdentityUpdateHandle: str = 'com.atproto.identity.updateHandle'
+    ComAtprotoLabelDefs: str = 'com.atproto.label.defs'
+    ComAtprotoLabelQueryLabels: str = 'com.atproto.label.queryLabels'
+    ComAtprotoLabelSubscribeLabels: str = 'com.atproto.label.subscribeLabels'
+    ComAtprotoModerationCreateReport: str = 'com.atproto.moderation.createReport'
+    ComAtprotoModerationDefs: str = 'com.atproto.moderation.defs'
+    ComAtprotoRepoApplyWrites: str = 'com.atproto.repo.applyWrites'
+    ComAtprotoRepoCreateRecord: str = 'com.atproto.repo.createRecord'
+    ComAtprotoRepoDeleteRecord: str = 'com.atproto.repo.deleteRecord'
+    ComAtprotoRepoDescribeRepo: str = 'com.atproto.repo.describeRepo'
+    ComAtprotoRepoGetRecord: str = 'com.atproto.repo.getRecord'
+    ComAtprotoRepoListRecords: str = 'com.atproto.repo.listRecords'
+    ComAtprotoRepoPutRecord: str = 'com.atproto.repo.putRecord'
+    ComAtprotoRepoStrongRef: str = 'com.atproto.repo.strongRef'
+    ComAtprotoRepoUploadBlob: str = 'com.atproto.repo.uploadBlob'
+    ComAtprotoServerConfirmEmail: str = 'com.atproto.server.confirmEmail'
+    ComAtprotoServerCreateAccount: str = 'com.atproto.server.createAccount'
+    ComAtprotoServerCreateAppPassword: str = 'com.atproto.server.createAppPassword'
+    ComAtprotoServerCreateInviteCode: str = 'com.atproto.server.createInviteCode'
+    ComAtprotoServerCreateInviteCodes: str = 'com.atproto.server.createInviteCodes'
+    ComAtprotoServerCreateSession: str = 'com.atproto.server.createSession'
+    ComAtprotoServerDefs: str = 'com.atproto.server.defs'
+    ComAtprotoServerDeleteAccount: str = 'com.atproto.server.deleteAccount'
+    ComAtprotoServerDeleteSession: str = 'com.atproto.server.deleteSession'
+    ComAtprotoServerDescribeServer: str = 'com.atproto.server.describeServer'
+    ComAtprotoServerGetAccountInviteCodes: str = 'com.atproto.server.getAccountInviteCodes'
+    ComAtprotoServerGetSession: str = 'com.atproto.server.getSession'
+    ComAtprotoServerListAppPasswords: str = 'com.atproto.server.listAppPasswords'
+    ComAtprotoServerRefreshSession: str = 'com.atproto.server.refreshSession'
+    ComAtprotoServerRequestAccountDelete: str = 'com.atproto.server.requestAccountDelete'
+    ComAtprotoServerRequestEmailConfirmation: str = 'com.atproto.server.requestEmailConfirmation'
+    ComAtprotoServerRequestEmailUpdate: str = 'com.atproto.server.requestEmailUpdate'
+    ComAtprotoServerRequestPasswordReset: str = 'com.atproto.server.requestPasswordReset'
+    ComAtprotoServerReserveSigningKey: str = 'com.atproto.server.reserveSigningKey'
+    ComAtprotoServerResetPassword: str = 'com.atproto.server.resetPassword'
+    ComAtprotoServerRevokeAppPassword: str = 'com.atproto.server.revokeAppPassword'
+    ComAtprotoServerUpdateEmail: str = 'com.atproto.server.updateEmail'
+    ComAtprotoSyncGetBlob: str = 'com.atproto.sync.getBlob'
+    ComAtprotoSyncGetBlocks: str = 'com.atproto.sync.getBlocks'
+    ComAtprotoSyncGetCheckout: str = 'com.atproto.sync.getCheckout'
+    ComAtprotoSyncGetHead: str = 'com.atproto.sync.getHead'
+    ComAtprotoSyncGetLatestCommit: str = 'com.atproto.sync.getLatestCommit'
+    ComAtprotoSyncGetRecord: str = 'com.atproto.sync.getRecord'
+    ComAtprotoSyncGetRepo: str = 'com.atproto.sync.getRepo'
+    ComAtprotoSyncListBlobs: str = 'com.atproto.sync.listBlobs'
+    ComAtprotoSyncListRepos: str = 'com.atproto.sync.listRepos'
+    ComAtprotoSyncNotifyOfUpdate: str = 'com.atproto.sync.notifyOfUpdate'
+    ComAtprotoSyncRequestCrawl: str = 'com.atproto.sync.requestCrawl'
+    ComAtprotoSyncSubscribeRepos: str = 'com.atproto.sync.subscribeRepos'
+    ComAtprotoTempFetchLabels: str = 'com.atproto.temp.fetchLabels'
+    ComAtprotoTempImportRepo: str = 'com.atproto.temp.importRepo'
+    ComAtprotoTempPushBlob: str = 'com.atproto.temp.pushBlob'
+    ComAtprotoTempTransferAccount: str = 'com.atproto.temp.transferAccount'
+
+
+ids = _Ids()
+load_models()
diff --git a/atproto/xrpc_client/models/app/__init__.py b/packages/atproto_client/models/app/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/__init__.py
rename to packages/atproto_client/models/app/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/__init__.py b/packages/atproto_client/models/app/bsky/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/__init__.py
rename to packages/atproto_client/models/app/bsky/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/actor/__init__.py b/packages/atproto_client/models/app/bsky/actor/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/actor/__init__.py
rename to packages/atproto_client/models/app/bsky/actor/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/actor/defs.py b/packages/atproto_client/models/app/bsky/actor/defs.py
similarity index 98%
rename from atproto/xrpc_client/models/app/bsky/actor/defs.py
rename to packages/atproto_client/models/app/bsky/actor/defs.py
index 24f09771..0f9fbfba 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/defs.py
+++ b/packages/atproto_client/models/app/bsky/actor/defs.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class ProfileViewBasic(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/get_preferences.py b/packages/atproto_client/models/app/bsky/actor/get_preferences.py
similarity index 89%
rename from atproto/xrpc_client/models/app/bsky/actor/get_preferences.py
rename to packages/atproto_client/models/app/bsky/actor/get_preferences.py
index b83b87a5..50a40344 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/get_preferences.py
+++ b/packages/atproto_client/models/app/bsky/actor/get_preferences.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/get_profile.py b/packages/atproto_client/models/app/bsky/actor/get_profile.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/actor/get_profile.py
rename to packages/atproto_client/models/app/bsky/actor/get_profile.py
index 0844d95f..042c5dbe 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/get_profile.py
+++ b/packages/atproto_client/models/app/bsky/actor/get_profile.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/get_profiles.py b/packages/atproto_client/models/app/bsky/actor/get_profiles.py
similarity index 90%
rename from atproto/xrpc_client/models/app/bsky/actor/get_profiles.py
rename to packages/atproto_client/models/app/bsky/actor/get_profiles.py
index f9d9782a..84749ff2 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/get_profiles.py
+++ b/packages/atproto_client/models/app/bsky/actor/get_profiles.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/get_suggestions.py b/packages/atproto_client/models/app/bsky/actor/get_suggestions.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/actor/get_suggestions.py
rename to packages/atproto_client/models/app/bsky/actor/get_suggestions.py
index e7b7a791..bdd4ad61 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/get_suggestions.py
+++ b/packages/atproto_client/models/app/bsky/actor/get_suggestions.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/profile.py b/packages/atproto_client/models/app/bsky/actor/profile.py
similarity index 88%
rename from atproto/xrpc_client/models/app/bsky/actor/profile.py
rename to packages/atproto_client/models/app/bsky/actor/profile.py
index 7f014d7c..79207cf5 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/profile.py
+++ b/packages/atproto_client/models/app/bsky/actor/profile.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/put_preferences.py b/packages/atproto_client/models/app/bsky/actor/put_preferences.py
similarity index 88%
rename from atproto/xrpc_client/models/app/bsky/actor/put_preferences.py
rename to packages/atproto_client/models/app/bsky/actor/put_preferences.py
index 453c952e..7b49045b 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/put_preferences.py
+++ b/packages/atproto_client/models/app/bsky/actor/put_preferences.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/search_actors.py b/packages/atproto_client/models/app/bsky/actor/search_actors.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/actor/search_actors.py
rename to packages/atproto_client/models/app/bsky/actor/search_actors.py
index d2eaf76b..170f08c7 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/search_actors.py
+++ b/packages/atproto_client/models/app/bsky/actor/search_actors.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/actor/search_actors_typeahead.py b/packages/atproto_client/models/app/bsky/actor/search_actors_typeahead.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/actor/search_actors_typeahead.py
rename to packages/atproto_client/models/app/bsky/actor/search_actors_typeahead.py
index 9eceafd9..22ad8cf1 100644
--- a/atproto/xrpc_client/models/app/bsky/actor/search_actors_typeahead.py
+++ b/packages/atproto_client/models/app/bsky/actor/search_actors_typeahead.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/embed/__init__.py b/packages/atproto_client/models/app/bsky/embed/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/embed/__init__.py
rename to packages/atproto_client/models/app/bsky/embed/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/embed/external.py b/packages/atproto_client/models/app/bsky/embed/external.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/embed/external.py
rename to packages/atproto_client/models/app/bsky/embed/external.py
index 92af417c..d56ef3fe 100644
--- a/atproto/xrpc_client/models/app/bsky/embed/external.py
+++ b/packages/atproto_client/models/app/bsky/embed/external.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/embed/images.py b/packages/atproto_client/models/app/bsky/embed/images.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/embed/images.py
rename to packages/atproto_client/models/app/bsky/embed/images.py
index 8f4aa2ce..291bcc15 100644
--- a/atproto/xrpc_client/models/app/bsky/embed/images.py
+++ b/packages/atproto_client/models/app/bsky/embed/images.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/embed/record.py b/packages/atproto_client/models/app/bsky/embed/record.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/embed/record.py
rename to packages/atproto_client/models/app/bsky/embed/record.py
index f18fe9e1..5b11cb82 100644
--- a/atproto/xrpc_client/models/app/bsky/embed/record.py
+++ b/packages/atproto_client/models/app/bsky/embed/record.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/embed/record_with_media.py b/packages/atproto_client/models/app/bsky/embed/record_with_media.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/embed/record_with_media.py
rename to packages/atproto_client/models/app/bsky/embed/record_with_media.py
index 52814ef1..1dd30643 100644
--- a/atproto/xrpc_client/models/app/bsky/embed/record_with_media.py
+++ b/packages/atproto_client/models/app/bsky/embed/record_with_media.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/__init__.py b/packages/atproto_client/models/app/bsky/feed/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/feed/__init__.py
rename to packages/atproto_client/models/app/bsky/feed/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/feed/defs.py b/packages/atproto_client/models/app/bsky/feed/defs.py
similarity index 98%
rename from atproto/xrpc_client/models/app/bsky/feed/defs.py
rename to packages/atproto_client/models/app/bsky/feed/defs.py
index 6d705e2f..611567e6 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/defs.py
+++ b/packages/atproto_client/models/app/bsky/feed/defs.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class PostView(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/describe_feed_generator.py b/packages/atproto_client/models/app/bsky/feed/describe_feed_generator.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/feed/describe_feed_generator.py
rename to packages/atproto_client/models/app/bsky/feed/describe_feed_generator.py
index fb083382..281224b3 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/describe_feed_generator.py
+++ b/packages/atproto_client/models/app/bsky/feed/describe_feed_generator.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/generator.py b/packages/atproto_client/models/app/bsky/feed/generator.py
similarity index 89%
rename from atproto/xrpc_client/models/app/bsky/feed/generator.py
rename to packages/atproto_client/models/app/bsky/feed/generator.py
index 42a16d7b..ee0a4cdb 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/generator.py
+++ b/packages/atproto_client/models/app/bsky/feed/generator.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_actor_feeds.py b/packages/atproto_client/models/app/bsky/feed/get_actor_feeds.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_actor_feeds.py
rename to packages/atproto_client/models/app/bsky/feed/get_actor_feeds.py
index 42073b2b..4910c0f9 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_actor_feeds.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_actor_feeds.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_actor_likes.py b/packages/atproto_client/models/app/bsky/feed/get_actor_likes.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_actor_likes.py
rename to packages/atproto_client/models/app/bsky/feed/get_actor_likes.py
index eae2d10e..96b9f2e0 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_actor_likes.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_actor_likes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_author_feed.py b/packages/atproto_client/models/app/bsky/feed/get_author_feed.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/feed/get_author_feed.py
rename to packages/atproto_client/models/app/bsky/feed/get_author_feed.py
index b3e3e1be..64796464 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_author_feed.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_author_feed.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_feed.py b/packages/atproto_client/models/app/bsky/feed/get_feed.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_feed.py
rename to packages/atproto_client/models/app/bsky/feed/get_feed.py
index d9d41106..12fb4028 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_feed.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_feed.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_feed_generator.py b/packages/atproto_client/models/app/bsky/feed/get_feed_generator.py
similarity index 91%
rename from atproto/xrpc_client/models/app/bsky/feed/get_feed_generator.py
rename to packages/atproto_client/models/app/bsky/feed/get_feed_generator.py
index d699d130..0f7128c5 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_feed_generator.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_feed_generator.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_feed_generators.py b/packages/atproto_client/models/app/bsky/feed/get_feed_generators.py
similarity index 90%
rename from atproto/xrpc_client/models/app/bsky/feed/get_feed_generators.py
rename to packages/atproto_client/models/app/bsky/feed/get_feed_generators.py
index 72a7f04b..f4e5f1b4 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_feed_generators.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_feed_generators.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_feed_skeleton.py b/packages/atproto_client/models/app/bsky/feed/get_feed_skeleton.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_feed_skeleton.py
rename to packages/atproto_client/models/app/bsky/feed/get_feed_skeleton.py
index ebea4dac..d65292d8 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_feed_skeleton.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_feed_skeleton.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_likes.py b/packages/atproto_client/models/app/bsky/feed/get_likes.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/feed/get_likes.py
rename to packages/atproto_client/models/app/bsky/feed/get_likes.py
index 3141f563..9c1a6eca 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_likes.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_likes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_list_feed.py b/packages/atproto_client/models/app/bsky/feed/get_list_feed.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_list_feed.py
rename to packages/atproto_client/models/app/bsky/feed/get_list_feed.py
index f7b703d3..558d923f 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_list_feed.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_list_feed.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_post_thread.py b/packages/atproto_client/models/app/bsky/feed/get_post_thread.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/feed/get_post_thread.py
rename to packages/atproto_client/models/app/bsky/feed/get_post_thread.py
index 62e17ce2..69553197 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_post_thread.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_post_thread.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_posts.py b/packages/atproto_client/models/app/bsky/feed/get_posts.py
similarity index 90%
rename from atproto/xrpc_client/models/app/bsky/feed/get_posts.py
rename to packages/atproto_client/models/app/bsky/feed/get_posts.py
index 49a60594..bb95aef8 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_posts.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_posts.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_reposted_by.py b/packages/atproto_client/models/app/bsky/feed/get_reposted_by.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/feed/get_reposted_by.py
rename to packages/atproto_client/models/app/bsky/feed/get_reposted_by.py
index 4c2934fb..aac7ff76 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_reposted_by.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_reposted_by.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_suggested_feeds.py b/packages/atproto_client/models/app/bsky/feed/get_suggested_feeds.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_suggested_feeds.py
rename to packages/atproto_client/models/app/bsky/feed/get_suggested_feeds.py
index 6d55dc2f..bbee7885 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_suggested_feeds.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_suggested_feeds.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/get_timeline.py b/packages/atproto_client/models/app/bsky/feed/get_timeline.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/feed/get_timeline.py
rename to packages/atproto_client/models/app/bsky/feed/get_timeline.py
index 0c8c6dea..9e261282 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/get_timeline.py
+++ b/packages/atproto_client/models/app/bsky/feed/get_timeline.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/like.py b/packages/atproto_client/models/app/bsky/feed/like.py
similarity index 89%
rename from atproto/xrpc_client/models/app/bsky/feed/like.py
rename to packages/atproto_client/models/app/bsky/feed/like.py
index 11fc44f4..f2b7d4d4 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/like.py
+++ b/packages/atproto_client/models/app/bsky/feed/like.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/post.py b/packages/atproto_client/models/app/bsky/feed/post.py
similarity index 97%
rename from atproto/xrpc_client/models/app/bsky/feed/post.py
rename to packages/atproto_client/models/app/bsky/feed/post.py
index da76edc1..508511ab 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/post.py
+++ b/packages/atproto_client/models/app/bsky/feed/post.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class ReplyRef(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/repost.py b/packages/atproto_client/models/app/bsky/feed/repost.py
similarity index 89%
rename from atproto/xrpc_client/models/app/bsky/feed/repost.py
rename to packages/atproto_client/models/app/bsky/feed/repost.py
index f7a8e280..b1b8478e 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/repost.py
+++ b/packages/atproto_client/models/app/bsky/feed/repost.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/search_posts.py b/packages/atproto_client/models/app/bsky/feed/search_posts.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/feed/search_posts.py
rename to packages/atproto_client/models/app/bsky/feed/search_posts.py
index 71420bc8..6cd425fe 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/search_posts.py
+++ b/packages/atproto_client/models/app/bsky/feed/search_posts.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/feed/threadgate.py b/packages/atproto_client/models/app/bsky/feed/threadgate.py
similarity index 96%
rename from atproto/xrpc_client/models/app/bsky/feed/threadgate.py
rename to packages/atproto_client/models/app/bsky/feed/threadgate.py
index 21bd3098..7a7837cb 100644
--- a/atproto/xrpc_client/models/app/bsky/feed/threadgate.py
+++ b/packages/atproto_client/models/app/bsky/feed/threadgate.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class MentionRule(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/__init__.py b/packages/atproto_client/models/app/bsky/graph/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/graph/__init__.py
rename to packages/atproto_client/models/app/bsky/graph/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/graph/block.py b/packages/atproto_client/models/app/bsky/graph/block.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/graph/block.py
rename to packages/atproto_client/models/app/bsky/graph/block.py
index 38c22510..6933becb 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/block.py
+++ b/packages/atproto_client/models/app/bsky/graph/block.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/defs.py b/packages/atproto_client/models/app/bsky/graph/defs.py
similarity index 97%
rename from atproto/xrpc_client/models/app/bsky/graph/defs.py
rename to packages/atproto_client/models/app/bsky/graph/defs.py
index 6b5d1f8c..d53a9e10 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/defs.py
+++ b/packages/atproto_client/models/app/bsky/graph/defs.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class ListViewBasic(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/follow.py b/packages/atproto_client/models/app/bsky/graph/follow.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/graph/follow.py
rename to packages/atproto_client/models/app/bsky/graph/follow.py
index 7a8a6a55..3d995e00 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/follow.py
+++ b/packages/atproto_client/models/app/bsky/graph/follow.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_blocks.py b/packages/atproto_client/models/app/bsky/graph/get_blocks.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_blocks.py
rename to packages/atproto_client/models/app/bsky/graph/get_blocks.py
index 4864ab45..9e3c0f58 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_blocks.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_blocks.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_followers.py b/packages/atproto_client/models/app/bsky/graph/get_followers.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_followers.py
rename to packages/atproto_client/models/app/bsky/graph/get_followers.py
index 74c0fff1..c36f2131 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_followers.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_followers.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_follows.py b/packages/atproto_client/models/app/bsky/graph/get_follows.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_follows.py
rename to packages/atproto_client/models/app/bsky/graph/get_follows.py
index cc574d55..cf3106a2 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_follows.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_follows.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_list.py b/packages/atproto_client/models/app/bsky/graph/get_list.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_list.py
rename to packages/atproto_client/models/app/bsky/graph/get_list.py
index e9851d92..4485f941 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_list.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_list.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_list_blocks.py b/packages/atproto_client/models/app/bsky/graph/get_list_blocks.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_list_blocks.py
rename to packages/atproto_client/models/app/bsky/graph/get_list_blocks.py
index f825ea23..46c10f21 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_list_blocks.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_list_blocks.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_list_mutes.py b/packages/atproto_client/models/app/bsky/graph/get_list_mutes.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_list_mutes.py
rename to packages/atproto_client/models/app/bsky/graph/get_list_mutes.py
index 9acc089e..56322d80 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_list_mutes.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_list_mutes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_lists.py b/packages/atproto_client/models/app/bsky/graph/get_lists.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_lists.py
rename to packages/atproto_client/models/app/bsky/graph/get_lists.py
index abd967c7..fe1edd76 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_lists.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_lists.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_mutes.py b/packages/atproto_client/models/app/bsky/graph/get_mutes.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/get_mutes.py
rename to packages/atproto_client/models/app/bsky/graph/get_mutes.py
index 96272f1c..8e939294 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_mutes.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_mutes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/get_suggested_follows_by_actor.py b/packages/atproto_client/models/app/bsky/graph/get_suggested_follows_by_actor.py
similarity index 90%
rename from atproto/xrpc_client/models/app/bsky/graph/get_suggested_follows_by_actor.py
rename to packages/atproto_client/models/app/bsky/graph/get_suggested_follows_by_actor.py
index b62022ea..f19b3ee5 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/get_suggested_follows_by_actor.py
+++ b/packages/atproto_client/models/app/bsky/graph/get_suggested_follows_by_actor.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/list.py b/packages/atproto_client/models/app/bsky/graph/list.py
similarity index 89%
rename from atproto/xrpc_client/models/app/bsky/graph/list.py
rename to packages/atproto_client/models/app/bsky/graph/list.py
index 02260329..9d5f4cfd 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/list.py
+++ b/packages/atproto_client/models/app/bsky/graph/list.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/listblock.py b/packages/atproto_client/models/app/bsky/graph/listblock.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/graph/listblock.py
rename to packages/atproto_client/models/app/bsky/graph/listblock.py
index 01b13eff..eddb38d2 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/listblock.py
+++ b/packages/atproto_client/models/app/bsky/graph/listblock.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/listitem.py b/packages/atproto_client/models/app/bsky/graph/listitem.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/graph/listitem.py
rename to packages/atproto_client/models/app/bsky/graph/listitem.py
index 1e61bc78..ad522907 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/listitem.py
+++ b/packages/atproto_client/models/app/bsky/graph/listitem.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Main(base.RecordModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/mute_actor.py b/packages/atproto_client/models/app/bsky/graph/mute_actor.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/mute_actor.py
rename to packages/atproto_client/models/app/bsky/graph/mute_actor.py
index db2bb0b3..b084859a 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/mute_actor.py
+++ b/packages/atproto_client/models/app/bsky/graph/mute_actor.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/mute_actor_list.py b/packages/atproto_client/models/app/bsky/graph/mute_actor_list.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/mute_actor_list.py
rename to packages/atproto_client/models/app/bsky/graph/mute_actor_list.py
index 0da1424b..fef1a52f 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/mute_actor_list.py
+++ b/packages/atproto_client/models/app/bsky/graph/mute_actor_list.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/unmute_actor.py b/packages/atproto_client/models/app/bsky/graph/unmute_actor.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/unmute_actor.py
rename to packages/atproto_client/models/app/bsky/graph/unmute_actor.py
index d60a9b27..8aa98bf3 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/unmute_actor.py
+++ b/packages/atproto_client/models/app/bsky/graph/unmute_actor.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/graph/unmute_actor_list.py b/packages/atproto_client/models/app/bsky/graph/unmute_actor_list.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/graph/unmute_actor_list.py
rename to packages/atproto_client/models/app/bsky/graph/unmute_actor_list.py
index 4aad5c80..6beb074c 100644
--- a/atproto/xrpc_client/models/app/bsky/graph/unmute_actor_list.py
+++ b/packages/atproto_client/models/app/bsky/graph/unmute_actor_list.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/notification/__init__.py b/packages/atproto_client/models/app/bsky/notification/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/notification/__init__.py
rename to packages/atproto_client/models/app/bsky/notification/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/notification/get_unread_count.py b/packages/atproto_client/models/app/bsky/notification/get_unread_count.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/notification/get_unread_count.py
rename to packages/atproto_client/models/app/bsky/notification/get_unread_count.py
index 3f635006..fa75a16e 100644
--- a/atproto/xrpc_client/models/app/bsky/notification/get_unread_count.py
+++ b/packages/atproto_client/models/app/bsky/notification/get_unread_count.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/notification/list_notifications.py b/packages/atproto_client/models/app/bsky/notification/list_notifications.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/notification/list_notifications.py
rename to packages/atproto_client/models/app/bsky/notification/list_notifications.py
index 5049092a..dc1cf00f 100644
--- a/atproto/xrpc_client/models/app/bsky/notification/list_notifications.py
+++ b/packages/atproto_client/models/app/bsky/notification/list_notifications.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/notification/register_push.py b/packages/atproto_client/models/app/bsky/notification/register_push.py
similarity index 94%
rename from atproto/xrpc_client/models/app/bsky/notification/register_push.py
rename to packages/atproto_client/models/app/bsky/notification/register_push.py
index 2c470f49..01090901 100644
--- a/atproto/xrpc_client/models/app/bsky/notification/register_push.py
+++ b/packages/atproto_client/models/app/bsky/notification/register_push.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/notification/update_seen.py b/packages/atproto_client/models/app/bsky/notification/update_seen.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/notification/update_seen.py
rename to packages/atproto_client/models/app/bsky/notification/update_seen.py
index 5d3d334d..766db1af 100644
--- a/atproto/xrpc_client/models/app/bsky/notification/update_seen.py
+++ b/packages/atproto_client/models/app/bsky/notification/update_seen.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/richtext/__init__.py b/packages/atproto_client/models/app/bsky/richtext/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/richtext/__init__.py
rename to packages/atproto_client/models/app/bsky/richtext/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/richtext/facet.py b/packages/atproto_client/models/app/bsky/richtext/facet.py
similarity index 96%
rename from atproto/xrpc_client/models/app/bsky/richtext/facet.py
rename to packages/atproto_client/models/app/bsky/richtext/facet.py
index be847498..fcc3e220 100644
--- a/atproto/xrpc_client/models/app/bsky/richtext/facet.py
+++ b/packages/atproto_client/models/app/bsky/richtext/facet.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/__init__.py b/packages/atproto_client/models/app/bsky/unspecced/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/app/bsky/unspecced/__init__.py
rename to packages/atproto_client/models/app/bsky/unspecced/__init__.py
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/defs.py b/packages/atproto_client/models/app/bsky/unspecced/defs.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/unspecced/defs.py
rename to packages/atproto_client/models/app/bsky/unspecced/defs.py
index 3add8126..14162cd8 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/defs.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/defs.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class SkeletonSearchPost(base.ModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/get_popular.py b/packages/atproto_client/models/app/bsky/unspecced/get_popular.py
similarity index 93%
rename from atproto/xrpc_client/models/app/bsky/unspecced/get_popular.py
rename to packages/atproto_client/models/app/bsky/unspecced/get_popular.py
index e6fd6e16..453e5a91 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/get_popular.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/get_popular.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/get_popular_feed_generators.py b/packages/atproto_client/models/app/bsky/unspecced/get_popular_feed_generators.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/unspecced/get_popular_feed_generators.py
rename to packages/atproto_client/models/app/bsky/unspecced/get_popular_feed_generators.py
index 68547e31..1bd5fa9f 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/get_popular_feed_generators.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/get_popular_feed_generators.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/get_timeline_skeleton.py b/packages/atproto_client/models/app/bsky/unspecced/get_timeline_skeleton.py
similarity index 92%
rename from atproto/xrpc_client/models/app/bsky/unspecced/get_timeline_skeleton.py
rename to packages/atproto_client/models/app/bsky/unspecced/get_timeline_skeleton.py
index d8103695..e4b7e041 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/get_timeline_skeleton.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/get_timeline_skeleton.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/search_actors_skeleton.py b/packages/atproto_client/models/app/bsky/unspecced/search_actors_skeleton.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/unspecced/search_actors_skeleton.py
rename to packages/atproto_client/models/app/bsky/unspecced/search_actors_skeleton.py
index d3e7e9b8..39f21e22 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/search_actors_skeleton.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/search_actors_skeleton.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/app/bsky/unspecced/search_posts_skeleton.py b/packages/atproto_client/models/app/bsky/unspecced/search_posts_skeleton.py
similarity index 95%
rename from atproto/xrpc_client/models/app/bsky/unspecced/search_posts_skeleton.py
rename to packages/atproto_client/models/app/bsky/unspecced/search_posts_skeleton.py
index e77da0c2..a24a1246 100644
--- a/atproto/xrpc_client/models/app/bsky/unspecced/search_posts_skeleton.py
+++ b/packages/atproto_client/models/app/bsky/unspecced/search_posts_skeleton.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/base.py b/packages/atproto_client/models/base.py
similarity index 96%
rename from atproto/xrpc_client/models/base.py
rename to packages/atproto_client/models/base.py
index 50105ab7..b39cea6b 100644
--- a/atproto/xrpc_client/models/base.py
+++ b/packages/atproto_client/models/base.py
@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel, ConfigDict, model_validator
 
-from atproto.exceptions import ModelFieldNotFoundError
+from atproto_client.exceptions import ModelFieldNotFoundError
 
 
 class AtProtocolBase:
diff --git a/atproto/xrpc_client/models/blob_ref.py b/packages/atproto_client/models/blob_ref.py
similarity index 89%
rename from atproto/xrpc_client/models/blob_ref.py
rename to packages/atproto_client/models/blob_ref.py
index aa632de4..bba6f760 100644
--- a/atproto/xrpc_client/models/blob_ref.py
+++ b/packages/atproto_client/models/blob_ref.py
@@ -4,7 +4,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 if t.TYPE_CHECKING:
-    from atproto.cid import CID
+    from atproto_core.cid import CID
 
 
 class BlobRefLink(BaseModel):
@@ -27,6 +27,6 @@ class BlobRef(BaseModel):
     @property
     def cid(self) -> 'CID':
         """Get CID."""
-        from atproto.cid import CID
+        from atproto_core.cid import CID
 
         return CID.decode(self.ref.link)
diff --git a/atproto/xrpc_client/models/com/__init__.py b/packages/atproto_client/models/com/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/__init__.py
rename to packages/atproto_client/models/com/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/__init__.py b/packages/atproto_client/models/com/atproto/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/__init__.py
rename to packages/atproto_client/models/com/atproto/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/admin/__init__.py b/packages/atproto_client/models/com/atproto/admin/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/admin/__init__.py
rename to packages/atproto_client/models/com/atproto/admin/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/admin/defs.py b/packages/atproto_client/models/com/atproto/admin/defs.py
similarity index 99%
rename from atproto/xrpc_client/models/com/atproto/admin/defs.py
rename to packages/atproto_client/models/com/atproto/admin/defs.py
index db67463b..42912621 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/defs.py
+++ b/packages/atproto_client/models/com/atproto/admin/defs.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class StatusAttr(base.ModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/delete_account.py b/packages/atproto_client/models/com/atproto/admin/delete_account.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/admin/delete_account.py
rename to packages/atproto_client/models/com/atproto/admin/delete_account.py
index 7a7df14f..56bfe509 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/delete_account.py
+++ b/packages/atproto_client/models/com/atproto/admin/delete_account.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/disable_account_invites.py b/packages/atproto_client/models/com/atproto/admin/disable_account_invites.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/admin/disable_account_invites.py
rename to packages/atproto_client/models/com/atproto/admin/disable_account_invites.py
index 3f101c9f..a53e84f0 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/disable_account_invites.py
+++ b/packages/atproto_client/models/com/atproto/admin/disable_account_invites.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/disable_invite_codes.py b/packages/atproto_client/models/com/atproto/admin/disable_invite_codes.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/admin/disable_invite_codes.py
rename to packages/atproto_client/models/com/atproto/admin/disable_invite_codes.py
index 027679dc..b6a793a2 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/disable_invite_codes.py
+++ b/packages/atproto_client/models/com/atproto/admin/disable_invite_codes.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/emit_moderation_event.py b/packages/atproto_client/models/com/atproto/admin/emit_moderation_event.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/admin/emit_moderation_event.py
rename to packages/atproto_client/models/com/atproto/admin/emit_moderation_event.py
index f98d6bd5..f7ddd380 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/emit_moderation_event.py
+++ b/packages/atproto_client/models/com/atproto/admin/emit_moderation_event.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/enable_account_invites.py b/packages/atproto_client/models/com/atproto/admin/enable_account_invites.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/admin/enable_account_invites.py
rename to packages/atproto_client/models/com/atproto/admin/enable_account_invites.py
index 863e00a2..2690853c 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/enable_account_invites.py
+++ b/packages/atproto_client/models/com/atproto/admin/enable_account_invites.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_account_info.py b/packages/atproto_client/models/com/atproto/admin/get_account_info.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/admin/get_account_info.py
rename to packages/atproto_client/models/com/atproto/admin/get_account_info.py
index 4694903c..c0fb3f08 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_account_info.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_account_info.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_invite_codes.py b/packages/atproto_client/models/com/atproto/admin/get_invite_codes.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/admin/get_invite_codes.py
rename to packages/atproto_client/models/com/atproto/admin/get_invite_codes.py
index 22ec424b..45b53c9f 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_invite_codes.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_invite_codes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_moderation_event.py b/packages/atproto_client/models/com/atproto/admin/get_moderation_event.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/admin/get_moderation_event.py
rename to packages/atproto_client/models/com/atproto/admin/get_moderation_event.py
index 42c1bc47..780ac1db 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_moderation_event.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_moderation_event.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_record.py b/packages/atproto_client/models/com/atproto/admin/get_record.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/admin/get_record.py
rename to packages/atproto_client/models/com/atproto/admin/get_record.py
index 287b0a33..d243d307 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_record.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_record.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_repo.py b/packages/atproto_client/models/com/atproto/admin/get_repo.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/admin/get_repo.py
rename to packages/atproto_client/models/com/atproto/admin/get_repo.py
index 09ae2093..ed25a362 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_repo.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_repo.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/get_subject_status.py b/packages/atproto_client/models/com/atproto/admin/get_subject_status.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/admin/get_subject_status.py
rename to packages/atproto_client/models/com/atproto/admin/get_subject_status.py
index 25ef5b81..e9b030a1 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/get_subject_status.py
+++ b/packages/atproto_client/models/com/atproto/admin/get_subject_status.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/query_moderation_events.py b/packages/atproto_client/models/com/atproto/admin/query_moderation_events.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/admin/query_moderation_events.py
rename to packages/atproto_client/models/com/atproto/admin/query_moderation_events.py
index 3fdf645c..c8e126d7 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/query_moderation_events.py
+++ b/packages/atproto_client/models/com/atproto/admin/query_moderation_events.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/query_moderation_statuses.py b/packages/atproto_client/models/com/atproto/admin/query_moderation_statuses.py
similarity index 97%
rename from atproto/xrpc_client/models/com/atproto/admin/query_moderation_statuses.py
rename to packages/atproto_client/models/com/atproto/admin/query_moderation_statuses.py
index 689ed362..517ff6fd 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/query_moderation_statuses.py
+++ b/packages/atproto_client/models/com/atproto/admin/query_moderation_statuses.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/search_repos.py b/packages/atproto_client/models/com/atproto/admin/search_repos.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/admin/search_repos.py
rename to packages/atproto_client/models/com/atproto/admin/search_repos.py
index 44fcd5c6..f086c265 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/search_repos.py
+++ b/packages/atproto_client/models/com/atproto/admin/search_repos.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/send_email.py b/packages/atproto_client/models/com/atproto/admin/send_email.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/admin/send_email.py
rename to packages/atproto_client/models/com/atproto/admin/send_email.py
index 75dd6147..ab568a08 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/send_email.py
+++ b/packages/atproto_client/models/com/atproto/admin/send_email.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/update_account_email.py b/packages/atproto_client/models/com/atproto/admin/update_account_email.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/admin/update_account_email.py
rename to packages/atproto_client/models/com/atproto/admin/update_account_email.py
index 77c7a0cf..3a067df5 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/update_account_email.py
+++ b/packages/atproto_client/models/com/atproto/admin/update_account_email.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/update_account_handle.py b/packages/atproto_client/models/com/atproto/admin/update_account_handle.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/admin/update_account_handle.py
rename to packages/atproto_client/models/com/atproto/admin/update_account_handle.py
index 89ef9fbb..455bf372 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/update_account_handle.py
+++ b/packages/atproto_client/models/com/atproto/admin/update_account_handle.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/admin/update_subject_status.py b/packages/atproto_client/models/com/atproto/admin/update_subject_status.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/admin/update_subject_status.py
rename to packages/atproto_client/models/com/atproto/admin/update_subject_status.py
index 5d9cfff8..482c64ad 100644
--- a/atproto/xrpc_client/models/com/atproto/admin/update_subject_status.py
+++ b/packages/atproto_client/models/com/atproto/admin/update_subject_status.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/identity/__init__.py b/packages/atproto_client/models/com/atproto/identity/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/identity/__init__.py
rename to packages/atproto_client/models/com/atproto/identity/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/identity/resolve_handle.py b/packages/atproto_client/models/com/atproto/identity/resolve_handle.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/identity/resolve_handle.py
rename to packages/atproto_client/models/com/atproto/identity/resolve_handle.py
index 608048f2..74fdb943 100644
--- a/atproto/xrpc_client/models/com/atproto/identity/resolve_handle.py
+++ b/packages/atproto_client/models/com/atproto/identity/resolve_handle.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/identity/update_handle.py b/packages/atproto_client/models/com/atproto/identity/update_handle.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/identity/update_handle.py
rename to packages/atproto_client/models/com/atproto/identity/update_handle.py
index 8e93b62a..d6918ad0 100644
--- a/atproto/xrpc_client/models/com/atproto/identity/update_handle.py
+++ b/packages/atproto_client/models/com/atproto/identity/update_handle.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/label/__init__.py b/packages/atproto_client/models/com/atproto/label/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/label/__init__.py
rename to packages/atproto_client/models/com/atproto/label/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/label/defs.py b/packages/atproto_client/models/com/atproto/label/defs.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/label/defs.py
rename to packages/atproto_client/models/com/atproto/label/defs.py
index 8f749433..948046ee 100644
--- a/atproto/xrpc_client/models/com/atproto/label/defs.py
+++ b/packages/atproto_client/models/com/atproto/label/defs.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Label(base.ModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/label/query_labels.py b/packages/atproto_client/models/com/atproto/label/query_labels.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/label/query_labels.py
rename to packages/atproto_client/models/com/atproto/label/query_labels.py
index 9852e3b5..4290acf5 100644
--- a/atproto/xrpc_client/models/com/atproto/label/query_labels.py
+++ b/packages/atproto_client/models/com/atproto/label/query_labels.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/label/subscribe_labels.py b/packages/atproto_client/models/com/atproto/label/subscribe_labels.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/label/subscribe_labels.py
rename to packages/atproto_client/models/com/atproto/label/subscribe_labels.py
index 407f6ce9..c267ce93 100644
--- a/atproto/xrpc_client/models/com/atproto/label/subscribe_labels.py
+++ b/packages/atproto_client/models/com/atproto/label/subscribe_labels.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/moderation/__init__.py b/packages/atproto_client/models/com/atproto/moderation/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/moderation/__init__.py
rename to packages/atproto_client/models/com/atproto/moderation/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/moderation/create_report.py b/packages/atproto_client/models/com/atproto/moderation/create_report.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/moderation/create_report.py
rename to packages/atproto_client/models/com/atproto/moderation/create_report.py
index 4912e534..c91644ed 100644
--- a/atproto/xrpc_client/models/com/atproto/moderation/create_report.py
+++ b/packages/atproto_client/models/com/atproto/moderation/create_report.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/moderation/defs.py b/packages/atproto_client/models/com/atproto/moderation/defs.py
similarity index 97%
rename from atproto/xrpc_client/models/com/atproto/moderation/defs.py
rename to packages/atproto_client/models/com/atproto/moderation/defs.py
index e8aac96c..63d3a485 100644
--- a/atproto/xrpc_client/models/com/atproto/moderation/defs.py
+++ b/packages/atproto_client/models/com/atproto/moderation/defs.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
+    from atproto_client import models
 
 ReasonType = t.Union[
     'models.ComAtprotoModerationDefs.ReasonSpam',
diff --git a/atproto/xrpc_client/models/com/atproto/repo/__init__.py b/packages/atproto_client/models/com/atproto/repo/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/repo/__init__.py
rename to packages/atproto_client/models/com/atproto/repo/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/repo/apply_writes.py b/packages/atproto_client/models/com/atproto/repo/apply_writes.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/repo/apply_writes.py
rename to packages/atproto_client/models/com/atproto/repo/apply_writes.py
index 8f22913a..6c330858 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/apply_writes.py
+++ b/packages/atproto_client/models/com/atproto/repo/apply_writes.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/create_record.py b/packages/atproto_client/models/com/atproto/repo/create_record.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/repo/create_record.py
rename to packages/atproto_client/models/com/atproto/repo/create_record.py
index 2fec1470..e6929bde 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/create_record.py
+++ b/packages/atproto_client/models/com/atproto/repo/create_record.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownInputType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownInputType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/delete_record.py b/packages/atproto_client/models/com/atproto/repo/delete_record.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/repo/delete_record.py
rename to packages/atproto_client/models/com/atproto/repo/delete_record.py
index b8eae953..641ae0d1 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/delete_record.py
+++ b/packages/atproto_client/models/com/atproto/repo/delete_record.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/describe_repo.py b/packages/atproto_client/models/com/atproto/repo/describe_repo.py
similarity index 90%
rename from atproto/xrpc_client/models/com/atproto/repo/describe_repo.py
rename to packages/atproto_client/models/com/atproto/repo/describe_repo.py
index 34c55a0a..bc39bc43 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/describe_repo.py
+++ b/packages/atproto_client/models/com/atproto/repo/describe_repo.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/get_record.py b/packages/atproto_client/models/com/atproto/repo/get_record.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/repo/get_record.py
rename to packages/atproto_client/models/com/atproto/repo/get_record.py
index ee9bdf94..23ef4f0f 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/get_record.py
+++ b/packages/atproto_client/models/com/atproto/repo/get_record.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/list_records.py b/packages/atproto_client/models/com/atproto/repo/list_records.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/repo/list_records.py
rename to packages/atproto_client/models/com/atproto/repo/list_records.py
index 893b3d52..3e07774f 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/list_records.py
+++ b/packages/atproto_client/models/com/atproto/repo/list_records.py
@@ -11,9 +11,9 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/put_record.py b/packages/atproto_client/models/com/atproto/repo/put_record.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/repo/put_record.py
rename to packages/atproto_client/models/com/atproto/repo/put_record.py
index fa9cf38b..47794d9d 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/put_record.py
+++ b/packages/atproto_client/models/com/atproto/repo/put_record.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownInputType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownInputType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/strong_ref.py b/packages/atproto_client/models/com/atproto/repo/strong_ref.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/repo/strong_ref.py
rename to packages/atproto_client/models/com/atproto/repo/strong_ref.py
index 14dc60c1..a5309c3b 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/strong_ref.py
+++ b/packages/atproto_client/models/com/atproto/repo/strong_ref.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Main(base.ModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/repo/upload_blob.py b/packages/atproto_client/models/com/atproto/repo/upload_blob.py
similarity index 85%
rename from atproto/xrpc_client/models/com/atproto/repo/upload_blob.py
rename to packages/atproto_client/models/com/atproto/repo/upload_blob.py
index 12062274..28b9696c 100644
--- a/atproto/xrpc_client/models/com/atproto/repo/upload_blob.py
+++ b/packages/atproto_client/models/com/atproto/repo/upload_blob.py
@@ -10,8 +10,8 @@
 import typing_extensions as te
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models import base
+    from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models import base
 
 #: Data raw data type.
 Data: te.TypeAlias = bytes
diff --git a/atproto/xrpc_client/models/com/atproto/server/__init__.py b/packages/atproto_client/models/com/atproto/server/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/server/__init__.py
rename to packages/atproto_client/models/com/atproto/server/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/server/confirm_email.py b/packages/atproto_client/models/com/atproto/server/confirm_email.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/server/confirm_email.py
rename to packages/atproto_client/models/com/atproto/server/confirm_email.py
index cffa6823..935750b4 100644
--- a/atproto/xrpc_client/models/com/atproto/server/confirm_email.py
+++ b/packages/atproto_client/models/com/atproto/server/confirm_email.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/create_account.py b/packages/atproto_client/models/com/atproto/server/create_account.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/server/create_account.py
rename to packages/atproto_client/models/com/atproto/server/create_account.py
index b7100b33..1a5bec06 100644
--- a/atproto/xrpc_client/models/com/atproto/server/create_account.py
+++ b/packages/atproto_client/models/com/atproto/server/create_account.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownInputType, UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownInputType, UnknownType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/create_app_password.py b/packages/atproto_client/models/com/atproto/server/create_app_password.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/server/create_app_password.py
rename to packages/atproto_client/models/com/atproto/server/create_app_password.py
index bf7edd40..f234a293 100644
--- a/atproto/xrpc_client/models/com/atproto/server/create_app_password.py
+++ b/packages/atproto_client/models/com/atproto/server/create_app_password.py
@@ -8,7 +8,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/create_invite_code.py b/packages/atproto_client/models/com/atproto/server/create_invite_code.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/server/create_invite_code.py
rename to packages/atproto_client/models/com/atproto/server/create_invite_code.py
index 404e067e..fb2dc562 100644
--- a/atproto/xrpc_client/models/com/atproto/server/create_invite_code.py
+++ b/packages/atproto_client/models/com/atproto/server/create_invite_code.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/create_invite_codes.py b/packages/atproto_client/models/com/atproto/server/create_invite_codes.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/server/create_invite_codes.py
rename to packages/atproto_client/models/com/atproto/server/create_invite_codes.py
index bbc5b4a7..c0560af2 100644
--- a/atproto/xrpc_client/models/com/atproto/server/create_invite_codes.py
+++ b/packages/atproto_client/models/com/atproto/server/create_invite_codes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/create_session.py b/packages/atproto_client/models/com/atproto/server/create_session.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/create_session.py
rename to packages/atproto_client/models/com/atproto/server/create_session.py
index a4ce3acf..4182aed8 100644
--- a/atproto/xrpc_client/models/com/atproto/server/create_session.py
+++ b/packages/atproto_client/models/com/atproto/server/create_session.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/defs.py b/packages/atproto_client/models/com/atproto/server/defs.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/server/defs.py
rename to packages/atproto_client/models/com/atproto/server/defs.py
index 4353e945..f8d6a557 100644
--- a/atproto/xrpc_client/models/com/atproto/server/defs.py
+++ b/packages/atproto_client/models/com/atproto/server/defs.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class InviteCode(base.ModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/delete_account.py b/packages/atproto_client/models/com/atproto/server/delete_account.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/server/delete_account.py
rename to packages/atproto_client/models/com/atproto/server/delete_account.py
index 357ff401..c5ba7ad6 100644
--- a/atproto/xrpc_client/models/com/atproto/server/delete_account.py
+++ b/packages/atproto_client/models/com/atproto/server/delete_account.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/delete_session.py b/packages/atproto_client/models/com/atproto/server/delete_session.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/server/delete_session.py
rename to packages/atproto_client/models/com/atproto/server/delete_session.py
diff --git a/atproto/xrpc_client/models/com/atproto/server/describe_server.py b/packages/atproto_client/models/com/atproto/server/describe_server.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/server/describe_server.py
rename to packages/atproto_client/models/com/atproto/server/describe_server.py
index 9b22e0a5..651b45b1 100644
--- a/atproto/xrpc_client/models/com/atproto/server/describe_server.py
+++ b/packages/atproto_client/models/com/atproto/server/describe_server.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/get_account_invite_codes.py b/packages/atproto_client/models/com/atproto/server/get_account_invite_codes.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/get_account_invite_codes.py
rename to packages/atproto_client/models/com/atproto/server/get_account_invite_codes.py
index c10ec8c5..077dc760 100644
--- a/atproto/xrpc_client/models/com/atproto/server/get_account_invite_codes.py
+++ b/packages/atproto_client/models/com/atproto/server/get_account_invite_codes.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/get_session.py b/packages/atproto_client/models/com/atproto/server/get_session.py
similarity index 87%
rename from atproto/xrpc_client/models/com/atproto/server/get_session.py
rename to packages/atproto_client/models/com/atproto/server/get_session.py
index a53e0f26..9f15d981 100644
--- a/atproto/xrpc_client/models/com/atproto/server/get_session.py
+++ b/packages/atproto_client/models/com/atproto/server/get_session.py
@@ -10,8 +10,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/list_app_passwords.py b/packages/atproto_client/models/com/atproto/server/list_app_passwords.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/list_app_passwords.py
rename to packages/atproto_client/models/com/atproto/server/list_app_passwords.py
index 9139b562..dcec3101 100644
--- a/atproto/xrpc_client/models/com/atproto/server/list_app_passwords.py
+++ b/packages/atproto_client/models/com/atproto/server/list_app_passwords.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/refresh_session.py b/packages/atproto_client/models/com/atproto/server/refresh_session.py
similarity index 87%
rename from atproto/xrpc_client/models/com/atproto/server/refresh_session.py
rename to packages/atproto_client/models/com/atproto/server/refresh_session.py
index d2f498ea..afcb76a2 100644
--- a/atproto/xrpc_client/models/com/atproto/server/refresh_session.py
+++ b/packages/atproto_client/models/com/atproto/server/refresh_session.py
@@ -10,8 +10,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownType
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/request_account_delete.py b/packages/atproto_client/models/com/atproto/server/request_account_delete.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/server/request_account_delete.py
rename to packages/atproto_client/models/com/atproto/server/request_account_delete.py
diff --git a/atproto/xrpc_client/models/com/atproto/server/request_email_confirmation.py b/packages/atproto_client/models/com/atproto/server/request_email_confirmation.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/server/request_email_confirmation.py
rename to packages/atproto_client/models/com/atproto/server/request_email_confirmation.py
diff --git a/atproto/xrpc_client/models/com/atproto/server/request_email_update.py b/packages/atproto_client/models/com/atproto/server/request_email_update.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/request_email_update.py
rename to packages/atproto_client/models/com/atproto/server/request_email_update.py
index 34e0aca0..3bfed364 100644
--- a/atproto/xrpc_client/models/com/atproto/server/request_email_update.py
+++ b/packages/atproto_client/models/com/atproto/server/request_email_update.py
@@ -7,7 +7,7 @@
 
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Response(base.ResponseModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/request_password_reset.py b/packages/atproto_client/models/com/atproto/server/request_password_reset.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/request_password_reset.py
rename to packages/atproto_client/models/com/atproto/server/request_password_reset.py
index 19115658..a344d29e 100644
--- a/atproto/xrpc_client/models/com/atproto/server/request_password_reset.py
+++ b/packages/atproto_client/models/com/atproto/server/request_password_reset.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/reserve_signing_key.py b/packages/atproto_client/models/com/atproto/server/reserve_signing_key.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/server/reserve_signing_key.py
rename to packages/atproto_client/models/com/atproto/server/reserve_signing_key.py
index 66a7a4db..df8530a6 100644
--- a/atproto/xrpc_client/models/com/atproto/server/reserve_signing_key.py
+++ b/packages/atproto_client/models/com/atproto/server/reserve_signing_key.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/reset_password.py b/packages/atproto_client/models/com/atproto/server/reset_password.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/server/reset_password.py
rename to packages/atproto_client/models/com/atproto/server/reset_password.py
index e60fd308..7e3692f8 100644
--- a/atproto/xrpc_client/models/com/atproto/server/reset_password.py
+++ b/packages/atproto_client/models/com/atproto/server/reset_password.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/revoke_app_password.py b/packages/atproto_client/models/com/atproto/server/revoke_app_password.py
similarity index 92%
rename from atproto/xrpc_client/models/com/atproto/server/revoke_app_password.py
rename to packages/atproto_client/models/com/atproto/server/revoke_app_password.py
index 9d307986..19d3c309 100644
--- a/atproto/xrpc_client/models/com/atproto/server/revoke_app_password.py
+++ b/packages/atproto_client/models/com/atproto/server/revoke_app_password.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/server/update_email.py b/packages/atproto_client/models/com/atproto/server/update_email.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/server/update_email.py
rename to packages/atproto_client/models/com/atproto/server/update_email.py
index 32ea9b46..e5eac3fc 100644
--- a/atproto/xrpc_client/models/com/atproto/server/update_email.py
+++ b/packages/atproto_client/models/com/atproto/server/update_email.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/__init__.py b/packages/atproto_client/models/com/atproto/sync/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/sync/__init__.py
rename to packages/atproto_client/models/com/atproto/sync/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_blob.py b/packages/atproto_client/models/com/atproto/sync/get_blob.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/sync/get_blob.py
rename to packages/atproto_client/models/com/atproto/sync/get_blob.py
index 89b11570..4b1b7786 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_blob.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_blob.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_blocks.py b/packages/atproto_client/models/com/atproto/sync/get_blocks.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/sync/get_blocks.py
rename to packages/atproto_client/models/com/atproto/sync/get_blocks.py
index 01fd6daa..cd747928 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_blocks.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_blocks.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_checkout.py b/packages/atproto_client/models/com/atproto/sync/get_checkout.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/sync/get_checkout.py
rename to packages/atproto_client/models/com/atproto/sync/get_checkout.py
index 6f938aa9..95791090 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_checkout.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_checkout.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_head.py b/packages/atproto_client/models/com/atproto/sync/get_head.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/sync/get_head.py
rename to packages/atproto_client/models/com/atproto/sync/get_head.py
index 3682ede5..cb28276c 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_head.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_head.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_latest_commit.py b/packages/atproto_client/models/com/atproto/sync/get_latest_commit.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/sync/get_latest_commit.py
rename to packages/atproto_client/models/com/atproto/sync/get_latest_commit.py
index eacf3a2d..d805528d 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_latest_commit.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_latest_commit.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_record.py b/packages/atproto_client/models/com/atproto/sync/get_record.py
similarity index 95%
rename from atproto/xrpc_client/models/com/atproto/sync/get_record.py
rename to packages/atproto_client/models/com/atproto/sync/get_record.py
index f675bf3d..49591245 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_record.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_record.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/get_repo.py b/packages/atproto_client/models/com/atproto/sync/get_repo.py
similarity index 94%
rename from atproto/xrpc_client/models/com/atproto/sync/get_repo.py
rename to packages/atproto_client/models/com/atproto/sync/get_repo.py
index 47554117..3aa02c0c 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/get_repo.py
+++ b/packages/atproto_client/models/com/atproto/sync/get_repo.py
@@ -9,7 +9,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/list_blobs.py b/packages/atproto_client/models/com/atproto/sync/list_blobs.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/sync/list_blobs.py
rename to packages/atproto_client/models/com/atproto/sync/list_blobs.py
index ad7d105c..6247ef25 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/list_blobs.py
+++ b/packages/atproto_client/models/com/atproto/sync/list_blobs.py
@@ -10,7 +10,7 @@
 import typing_extensions as te
 from pydantic import Field
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/list_repos.py b/packages/atproto_client/models/com/atproto/sync/list_repos.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/sync/list_repos.py
rename to packages/atproto_client/models/com/atproto/sync/list_repos.py
index f631b635..7142cd87 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/list_repos.py
+++ b/packages/atproto_client/models/com/atproto/sync/list_repos.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/notify_of_update.py b/packages/atproto_client/models/com/atproto/sync/notify_of_update.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/sync/notify_of_update.py
rename to packages/atproto_client/models/com/atproto/sync/notify_of_update.py
index c13a45ea..6902d63e 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/notify_of_update.py
+++ b/packages/atproto_client/models/com/atproto/sync/notify_of_update.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/request_crawl.py b/packages/atproto_client/models/com/atproto/sync/request_crawl.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/sync/request_crawl.py
rename to packages/atproto_client/models/com/atproto/sync/request_crawl.py
index 1b017faf..16b63ffe 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/request_crawl.py
+++ b/packages/atproto_client/models/com/atproto/sync/request_crawl.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/sync/subscribe_repos.py b/packages/atproto_client/models/com/atproto/sync/subscribe_repos.py
similarity index 96%
rename from atproto/xrpc_client/models/com/atproto/sync/subscribe_repos.py
rename to packages/atproto_client/models/com/atproto/sync/subscribe_repos.py
index 8b4432c0..bc16aaf6 100644
--- a/atproto/xrpc_client/models/com/atproto/sync/subscribe_repos.py
+++ b/packages/atproto_client/models/com/atproto/sync/subscribe_repos.py
@@ -11,9 +11,10 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto import CIDType
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_core.cid import CIDType
+
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/temp/__init__.py b/packages/atproto_client/models/com/atproto/temp/__init__.py
similarity index 100%
rename from atproto/xrpc_client/models/com/atproto/temp/__init__.py
rename to packages/atproto_client/models/com/atproto/temp/__init__.py
diff --git a/atproto/xrpc_client/models/com/atproto/temp/fetch_labels.py b/packages/atproto_client/models/com/atproto/temp/fetch_labels.py
similarity index 91%
rename from atproto/xrpc_client/models/com/atproto/temp/fetch_labels.py
rename to packages/atproto_client/models/com/atproto/temp/fetch_labels.py
index 89dfd304..cdb4ef70 100644
--- a/atproto/xrpc_client/models/com/atproto/temp/fetch_labels.py
+++ b/packages/atproto_client/models/com/atproto/temp/fetch_labels.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-from atproto.xrpc_client.models import base
+    from atproto_client import models
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/temp/import_repo.py b/packages/atproto_client/models/com/atproto/temp/import_repo.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/temp/import_repo.py
rename to packages/atproto_client/models/com/atproto/temp/import_repo.py
index 2eb42be6..c9df80c2 100644
--- a/atproto/xrpc_client/models/com/atproto/temp/import_repo.py
+++ b/packages/atproto_client/models/com/atproto/temp/import_repo.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/temp/push_blob.py b/packages/atproto_client/models/com/atproto/temp/push_blob.py
similarity index 93%
rename from atproto/xrpc_client/models/com/atproto/temp/push_blob.py
rename to packages/atproto_client/models/com/atproto/temp/push_blob.py
index a25024b3..65584c2d 100644
--- a/atproto/xrpc_client/models/com/atproto/temp/push_blob.py
+++ b/packages/atproto_client/models/com/atproto/temp/push_blob.py
@@ -7,7 +7,7 @@
 
 import typing_extensions as te
 
-from atproto.xrpc_client.models import base
+from atproto_client.models import base
 
 
 class Params(base.ParamsModelBase):
diff --git a/atproto/xrpc_client/models/com/atproto/temp/transfer_account.py b/packages/atproto_client/models/com/atproto/temp/transfer_account.py
similarity index 90%
rename from atproto/xrpc_client/models/com/atproto/temp/transfer_account.py
rename to packages/atproto_client/models/com/atproto/temp/transfer_account.py
index d4738f47..6798ab56 100644
--- a/atproto/xrpc_client/models/com/atproto/temp/transfer_account.py
+++ b/packages/atproto_client/models/com/atproto/temp/transfer_account.py
@@ -11,8 +11,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.unknown_type import UnknownInputType
-from atproto.xrpc_client.models import base
+    from atproto_client.models.unknown_type import UnknownInputType
+from atproto_client.models import base
 
 
 class Data(base.DataModelBase):
diff --git a/atproto/xrpc_client/models/common.py b/packages/atproto_client/models/common.py
similarity index 100%
rename from atproto/xrpc_client/models/common.py
rename to packages/atproto_client/models/common.py
diff --git a/atproto/xrpc_client/models/dot_dict.py b/packages/atproto_client/models/dot_dict.py
similarity index 99%
rename from atproto/xrpc_client/models/dot_dict.py
rename to packages/atproto_client/models/dot_dict.py
index 61b1517f..948e232d 100644
--- a/atproto/xrpc_client/models/dot_dict.py
+++ b/packages/atproto_client/models/dot_dict.py
@@ -7,7 +7,7 @@
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import core_schema
 
-from atproto.xrpc_client.models.base import UnknownDict
+from atproto_client.models.base import UnknownDict
 
 
 def _convert_camel_case_to_snake_case(string: str) -> str:
diff --git a/atproto/xrpc_client/models/languages.py b/packages/atproto_client/models/languages.py
similarity index 100%
rename from atproto/xrpc_client/models/languages.py
rename to packages/atproto_client/models/languages.py
diff --git a/atproto/xrpc_client/models/models_loader.py b/packages/atproto_client/models/models_loader.py
similarity index 78%
rename from atproto/xrpc_client/models/models_loader.py
rename to packages/atproto_client/models/models_loader.py
index 915d01f9..26ba7a55 100644
--- a/atproto/xrpc_client/models/models_loader.py
+++ b/packages/atproto_client/models/models_loader.py
@@ -18,7 +18,7 @@ def __get_models_to_rebuild_set() -> set:
     # use a set to remove duplicates
     models_to_rebuild = set()
 
-    from atproto.xrpc_client import models
+    from atproto_client import models
 
     for var_name in dir(models).copy():
         var_value = getattr(models, var_name)
@@ -37,11 +37,11 @@ def __get_models_to_rebuild_set() -> set:
 
 def __rebuild_all_models() -> None:
     # load models to the scope
-    from atproto.xrpc_client import models  # noqa
-    from atproto.xrpc_client.models.unknown_type import UnknownType, UnknownInputType
-    from atproto.xrpc_client.models.blob_ref import BlobRef
-    from atproto.xrpc_client.models import dot_dict
-    from atproto import CIDType
+    from atproto_client import models  # noqa
+    from atproto_client.models.unknown_type import UnknownType, UnknownInputType
+    from atproto_client.models.blob_ref import BlobRef
+    from atproto_client.models import dot_dict
+    from atproto_core.cid import CIDType
 
     UnknownType, UnknownInputType, CIDType, dot_dict  # noqa: B018
 
diff --git a/atproto/xrpc_client/models/type_conversion.py b/packages/atproto_client/models/type_conversion.py
similarity index 94%
rename from atproto/xrpc_client/models/type_conversion.py
rename to packages/atproto_client/models/type_conversion.py
index 008cb9db..f60dc0b3 100644
--- a/atproto/xrpc_client/models/type_conversion.py
+++ b/packages/atproto_client/models/type_conversion.py
@@ -1,4 +1,4 @@
-from atproto.xrpc_client import models
+from atproto_client import models
 
 RECORD_TYPE_TO_MODEL_CLASS = {
     'app.bsky.actor.profile': models.AppBskyActorProfile.Main,
diff --git a/atproto/xrpc_client/models/unknown_type.py b/packages/atproto_client/models/unknown_type.py
similarity index 93%
rename from atproto/xrpc_client/models/unknown_type.py
rename to packages/atproto_client/models/unknown_type.py
index cac89772..602ccc3e 100644
--- a/atproto/xrpc_client/models/unknown_type.py
+++ b/packages/atproto_client/models/unknown_type.py
@@ -4,8 +4,8 @@
 from pydantic import Field
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client import models
-    from atproto.xrpc_client.models import dot_dict
+    from atproto_client import models
+    from atproto_client.models import dot_dict
 
 UnknownRecordType: te.TypeAlias = t.Union[
     'models.AppBskyActorProfile.Main',
diff --git a/atproto/xrpc_client/models/utils.py b/packages/atproto_client/models/utils.py
similarity index 93%
rename from atproto/xrpc_client/models/utils.py
rename to packages/atproto_client/models/utils.py
index 902abf67..280727cb 100644
--- a/atproto/xrpc_client/models/utils.py
+++ b/packages/atproto_client/models/utils.py
@@ -5,19 +5,19 @@
 import typing_extensions as te
 from pydantic import ValidationError
 
-from atproto.exceptions import (
+from atproto_client import models
+from atproto_client.exceptions import (
     ModelError,
     ModelFieldNotFoundError,
 )
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models.base import ModelBase
-from atproto.xrpc_client.models.blob_ref import BlobRef
-from atproto.xrpc_client.models.dot_dict import DotDict
-from atproto.xrpc_client.models.type_conversion import RECORD_TYPE_TO_MODEL_CLASS
-from atproto.xrpc_client.models.unknown_type import UnknownRecordType
+from atproto_client.models.base import ModelBase
+from atproto_client.models.blob_ref import BlobRef
+from atproto_client.models.dot_dict import DotDict
+from atproto_client.models.type_conversion import RECORD_TYPE_TO_MODEL_CLASS
+from atproto_client.models.unknown_type import UnknownRecordType
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.request import Response
+    from atproto_client.request import Response
 
 M = t.TypeVar('M')
 ModelData: te.TypeAlias = t.Union[M, dict, None]
diff --git a/atproto/codegen/models/__init__.py b/packages/atproto_client/namespaces/__init__.py
similarity index 100%
rename from atproto/codegen/models/__init__.py
rename to packages/atproto_client/namespaces/__init__.py
diff --git a/atproto/xrpc_client/namespaces/async_ns.py b/packages/atproto_client/namespaces/async_ns.py
similarity index 99%
rename from atproto/xrpc_client/namespaces/async_ns.py
rename to packages/atproto_client/namespaces/async_ns.py
index 4e3d81c7..f29277f7 100644
--- a/atproto/xrpc_client/namespaces/async_ns.py
+++ b/packages/atproto_client/namespaces/async_ns.py
@@ -7,12 +7,12 @@
 
 import typing as t
 
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models.utils import get_or_create, get_response_model
-from atproto.xrpc_client.namespaces.base import AsyncNamespaceBase
+from atproto_client import models
+from atproto_client.models.utils import get_or_create, get_response_model
+from atproto_client.namespaces.base import AsyncNamespaceBase
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.client.async_raw import AsyncClientRaw
+    from atproto_client.client.async_raw import AsyncClientRaw
 
 
 class AppNamespace(AsyncNamespaceBase):
diff --git a/atproto/xrpc_client/namespaces/base.py b/packages/atproto_client/namespaces/base.py
similarity index 75%
rename from atproto/xrpc_client/namespaces/base.py
rename to packages/atproto_client/namespaces/base.py
index bb67eee9..ade2d3ca 100644
--- a/atproto/xrpc_client/namespaces/base.py
+++ b/packages/atproto_client/namespaces/base.py
@@ -2,8 +2,8 @@
 from dataclasses import dataclass
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.client.async_raw import AsyncClientRaw
-    from atproto.xrpc_client.client.raw import ClientRaw
+    from atproto_client.client.async_raw import AsyncClientRaw
+    from atproto_client.client.raw import ClientRaw
 
 
 class NamespaceBase:
diff --git a/atproto/xrpc_client/namespaces/sync_ns.py b/packages/atproto_client/namespaces/sync_ns.py
similarity index 99%
rename from atproto/xrpc_client/namespaces/sync_ns.py
rename to packages/atproto_client/namespaces/sync_ns.py
index c6b243c3..038096cb 100644
--- a/atproto/xrpc_client/namespaces/sync_ns.py
+++ b/packages/atproto_client/namespaces/sync_ns.py
@@ -7,12 +7,12 @@
 
 import typing as t
 
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models.utils import get_or_create, get_response_model
-from atproto.xrpc_client.namespaces.base import NamespaceBase
+from atproto_client import models
+from atproto_client.models.utils import get_or_create, get_response_model
+from atproto_client.namespaces.base import NamespaceBase
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.client.raw import ClientRaw
+    from atproto_client.client.raw import ClientRaw
 
 
 class AppNamespace(NamespaceBase):
diff --git a/atproto/xrpc_client/request.py b/packages/atproto_client/request.py
similarity index 96%
rename from atproto/xrpc_client/request.py
rename to packages/atproto_client/request.py
index f0e4c9a1..960f8bd6 100644
--- a/atproto/xrpc_client/request.py
+++ b/packages/atproto_client/request.py
@@ -4,9 +4,9 @@
 
 import httpx
 
-from atproto import exceptions
-from atproto.xrpc_client.models.common import XrpcError
-from atproto.xrpc_client.models.utils import get_or_create, is_json
+from atproto_client import exceptions
+from atproto_client.models.common import XrpcError
+from atproto_client.models.utils import get_or_create, is_json
 
 
 @dataclass
diff --git a/atproto/utils/__init__.py b/packages/atproto_client/utils/__init__.py
similarity index 100%
rename from atproto/utils/__init__.py
rename to packages/atproto_client/utils/__init__.py
diff --git a/atproto/utils/text_builder.py b/packages/atproto_client/utils/text_builder.py
similarity index 99%
rename from atproto/utils/text_builder.py
rename to packages/atproto_client/utils/text_builder.py
index 4869c518..c041ddb8 100644
--- a/atproto/utils/text_builder.py
+++ b/packages/atproto_client/utils/text_builder.py
@@ -1,7 +1,7 @@
 import typing as t
 from io import BytesIO
 
-from atproto import models
+from atproto_client import models
 
 _FEATURES_TYPE = t.List[
     t.Union[
diff --git a/atproto/codegen/namespaces/__init__.py b/packages/atproto_codegen/__init__.py
similarity index 100%
rename from atproto/codegen/namespaces/__init__.py
rename to packages/atproto_codegen/__init__.py
diff --git a/atproto/lexicon/__init__.py b/packages/atproto_codegen/clients/__init__.py
similarity index 100%
rename from atproto/lexicon/__init__.py
rename to packages/atproto_codegen/clients/__init__.py
diff --git a/atproto/codegen/clients/generate_async_client.py b/packages/atproto_codegen/clients/generate_async_client.py
similarity index 86%
rename from atproto/codegen/clients/generate_async_client.py
rename to packages/atproto_codegen/clients/generate_async_client.py
index 9265ea1e..d8bca4e3 100644
--- a/atproto/codegen/clients/generate_async_client.py
+++ b/packages/atproto_codegen/clients/generate_async_client.py
@@ -1,8 +1,9 @@
 from pathlib import Path
 
-from atproto.codegen import DISCLAIMER, format_code, write_code
+from atproto_codegen.consts import DISCLAIMER
+from atproto_codegen.utils import format_code, write_code
 
-_CLIENT_DIR = Path(__file__).parent.parent.parent.joinpath('xrpc_client', 'client')
+_CLIENT_DIR = Path(__file__).parent.parent.parent.joinpath('atproto_client', 'client')
 
 
 def gen_client(input_filename: str, output_filename: str) -> None:
diff --git a/packages/atproto_codegen/consts.py b/packages/atproto_codegen/consts.py
new file mode 100644
index 00000000..b8fbcc40
--- /dev/null
+++ b/packages/atproto_codegen/consts.py
@@ -0,0 +1,15 @@
+
+_DISCLAIMER_LINES = [
+    "# THIS IS THE AUTO-GENERATED CODE. DON'T EDIT IT BY HANDS!",
+    '# Copyright (C) 2023 Ilya (Marshal) <https://github.com/MarshalX>.',
+    '# This file is part of Python atproto SDK. Licenced under MIT.',
+]
+_MAX_DISCLAIMER_LEN = max([len(s) for s in _DISCLAIMER_LINES])
+DISCLAIMER = '\n'.join(_DISCLAIMER_LINES)
+DISCLAIMER = f'{"#" * _MAX_DISCLAIMER_LEN}\n{DISCLAIMER}\n{"#" * _MAX_DISCLAIMER_LEN}\n\n'
+
+PARAMS_MODEL = 'Params'
+PARAMS_DICT = 'ParamsDict'
+INPUT_MODEL = 'Data'
+INPUT_DICT = 'DataDict'
+OUTPUT_MODEL = 'Response'
diff --git a/atproto/xrpc_client/__init__.py b/packages/atproto_codegen/models/__init__.py
similarity index 100%
rename from atproto/xrpc_client/__init__.py
rename to packages/atproto_codegen/models/__init__.py
diff --git a/atproto/codegen/models/builder.py b/packages/atproto_codegen/models/builder.py
similarity index 96%
rename from atproto/codegen/models/builder.py
rename to packages/atproto_codegen/models/builder.py
index e511954a..4fd329ec 100644
--- a/atproto/codegen/models/builder.py
+++ b/packages/atproto_codegen/models/builder.py
@@ -1,9 +1,9 @@
 import typing as t
 from pathlib import Path
 
-from atproto.lexicon import models
-from atproto.lexicon.parser import lexicon_parse_dir
-from atproto.nsid import NSID
+from atproto_core.nsid import NSID
+from atproto_lexicon import models
+from atproto_lexicon.parser import lexicon_parse_dir
 
 if t.TYPE_CHECKING:
     from enum import Enum
diff --git a/atproto/codegen/models/generator.py b/packages/atproto_codegen/models/generator.py
similarity index 95%
rename from atproto/codegen/models/generator.py
rename to packages/atproto_codegen/models/generator.py
index d2bd3c71..87b472c9 100644
--- a/atproto/codegen/models/generator.py
+++ b/packages/atproto_codegen/models/generator.py
@@ -4,13 +4,19 @@
 from functools import lru_cache
 from pathlib import Path
 
-from atproto.codegen import (
+from atproto_core.nsid import NSID
+from atproto_lexicon import models
+
+from atproto_codegen.consts import (
     DISCLAIMER,
     INPUT_DICT,
     INPUT_MODEL,
     OUTPUT_MODEL,
     PARAMS_DICT,
     PARAMS_MODEL,
+)
+from atproto_codegen.models import builder
+from atproto_codegen.utils import (
     _resolve_nsid_ref,
     append_code,
     convert_camel_case_to_snake_case,
@@ -22,12 +28,9 @@
     join_code,
     write_code,
 )
-from atproto.codegen import get_code_intent as _
-from atproto.codegen.models import builder
-from atproto.lexicon import models
-from atproto.nsid import NSID
+from atproto_codegen.utils import get_code_intent as _
 
-_MODELS_OUTPUT_DIR = Path(__file__).parent.parent.parent.joinpath('xrpc_client', 'models')
+_MODELS_OUTPUT_DIR = Path(__file__).parent.parent.parent.joinpath( 'atproto_client', 'models')
 
 
 class ModelType(Enum):
@@ -62,12 +65,12 @@ def _get_model_imports() -> str:
         'from pydantic import Field',
         '',
         'if t.TYPE_CHECKING:',
-        f'{_(1)}from atproto.xrpc_client import models',
-        f'{_(1)}from atproto.xrpc_client.models.unknown_type import UnknownType',
-        f'{_(1)}from atproto.xrpc_client.models.unknown_type import UnknownInputType',
-        f'{_(1)}from atproto.xrpc_client.models.blob_ref import BlobRef',
-        f'{_(1)}from atproto import CIDType',
-        'from atproto.xrpc_client.models import base',
+        f'{_(1)}from atproto_client import models',
+        f'{_(1)}from atproto_client.models.unknown_type import UnknownType',
+        f'{_(1)}from atproto_client.models.unknown_type import UnknownInputType',
+        f'{_(1)}from atproto_client.models.blob_ref import BlobRef',
+        f'{_(1)}from atproto_core.cid import CIDType',
+        'from atproto_client.models import base',
         '',
         '',
     ]
@@ -615,16 +618,16 @@ def _generate_record_models(lex_db: builder.BuiltRecordModels) -> None:
 
 
 def _generate_record_type_database(lex_db: builder.BuiltRecordModels) -> None:
-    type_conversion_lines = ['from atproto.xrpc_client import models', 'RECORD_TYPE_TO_MODEL_CLASS = {']
+    type_conversion_lines = ['from atproto_client import models', 'RECORD_TYPE_TO_MODEL_CLASS = {']
 
     import_lines = [
         'import typing as t',
         'import typing_extensions as te',
         'from pydantic import Field',
         'if t.TYPE_CHECKING:',
-        f'{_(4)}from atproto.xrpc_client.models import base',
-        f'{_(4)}from atproto.xrpc_client import models',
-        f'{_(4)}from atproto.xrpc_client.models import dot_dict',
+        f'{_(4)}from atproto_client.models import base',
+        f'{_(4)}from atproto_client import models',
+        f'{_(4)}from atproto_client.models import dot_dict',
         '',
     ]
     unknown_record_type_hint_lines = ['UnknownRecordType: te.TypeAlias = t.Union[']
@@ -688,7 +691,7 @@ def _generate_init_files(root_package_path: Path) -> None:
             import_parts = root_path.parts[root_path.parts.index(_MODELS_OUTPUT_DIR.parent.name) :]
             from_import = '.'.join(import_parts)
 
-            import_lines.append(f'from atproto.{from_import} import {file_name[:-3]}')
+            import_lines.append(f'from atproto_client.{from_import} import {file_name[:-3]}')
 
         if root_path.name == 'models':
             # FIXME skip for now. should be generated too
@@ -727,7 +730,7 @@ def _generate_empty_init_files(root_package_path: Path) -> None:
 
 def _generate_import_aliases(root_package_path: Path) -> None:
     # is generates __init__.py file if models dir with aliases like this:
-    # from xrpc_client.models.app.bsky.actor import defs as AppBskyActorDefs # noqa: ERA001
+    # from atproto_client.models.app.bsky.actor import defs as AppBskyActorDefs # noqa: ERA001
 
     import_lines = []
     ids_db = ['class _Ids:']
@@ -754,17 +757,17 @@ def _generate_import_aliases(root_package_path: Path) -> None:
             method_path = f"{'.'.join(nsid_parts)}.{camel_case_method_name}"
             ids_db.append(f"{_(1)}{alias_name}: str = '{method_path}'")
 
-            import_lines.append(f'from atproto.{from_import} import {file[:-3]} as {alias_name}')
+            import_lines.append(f'from {from_import} import {file[:-3]} as {alias_name}')
 
     import_lines.append(
-        'from atproto.xrpc_client.models.utils import '
+        'from atproto_client.models.utils import '
         'create_strong_ref, '
         'get_model_as_dict, '
         'get_model_as_json, '
         'get_or_create, '
         'is_record_type'
     )
-    import_lines.append('from atproto.xrpc_client.models.models_loader import load_models')
+    import_lines.append('from atproto_client.models.models_loader import load_models')
 
     ids_db.append('ids = _Ids()')
     import_lines.extend(ids_db)
diff --git a/atproto/xrpc_client/client/__init__.py b/packages/atproto_codegen/namespaces/__init__.py
similarity index 100%
rename from atproto/xrpc_client/client/__init__.py
rename to packages/atproto_codegen/namespaces/__init__.py
diff --git a/atproto/codegen/namespaces/builder.py b/packages/atproto_codegen/namespaces/builder.py
similarity index 95%
rename from atproto/codegen/namespaces/builder.py
rename to packages/atproto_codegen/namespaces/builder.py
index 9fbebb90..c00feabc 100644
--- a/atproto/codegen/namespaces/builder.py
+++ b/packages/atproto_codegen/namespaces/builder.py
@@ -2,7 +2,8 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from atproto.lexicon.models import (
+from atproto_core.nsid import NSID
+from atproto_lexicon.models import (
     LexDefinition,
     LexDefinitionType,
     LexiconDoc,
@@ -10,8 +11,7 @@
     LexXrpcProcedure,
     LexXrpcQuery,
 )
-from atproto.lexicon.parser import lexicon_parse_dir
-from atproto.nsid import NSID
+from atproto_lexicon.parser import lexicon_parse_dir
 
 _VALID_LEX_DEF_TYPES = {LexDefinitionType.QUERY, LexDefinitionType.PROCEDURE, LexDefinitionType.RECORD}
 
diff --git a/atproto/codegen/namespaces/generator.py b/packages/atproto_codegen/namespaces/generator.py
similarity index 94%
rename from atproto/codegen/namespaces/generator.py
rename to packages/atproto_codegen/namespaces/generator.py
index 8ff5ee1c..03c381ad 100644
--- a/atproto/codegen/namespaces/generator.py
+++ b/packages/atproto_codegen/namespaces/generator.py
@@ -1,13 +1,25 @@
 import typing as t
 from pathlib import Path
 
-from atproto.codegen import (
+from atproto_core.nsid import NSID
+from atproto_lexicon.models import (
+    LexObject,
+    LexRef,
+    LexXrpcParameters,
+    LexXrpcProcedure,
+    LexXrpcQuery,
+)
+
+from atproto_codegen.consts import (
     DISCLAIMER,
     INPUT_DICT,
     INPUT_MODEL,
     OUTPUT_MODEL,
     PARAMS_DICT,
     PARAMS_MODEL,
+)
+from atproto_codegen.namespaces.builder import MethodInfo, ProcedureInfo, QueryInfo, RecordInfo, build_namespaces
+from atproto_codegen.utils import (
     _resolve_nsid_ref,
     convert_camel_case_to_snake_case,
     format_code,
@@ -18,18 +30,9 @@
     sort_dict_by_key,
     write_code,
 )
-from atproto.codegen import get_code_intent as _
-from atproto.codegen.namespaces.builder import MethodInfo, ProcedureInfo, QueryInfo, RecordInfo, build_namespaces
-from atproto.lexicon.models import (
-    LexObject,
-    LexRef,
-    LexXrpcParameters,
-    LexXrpcProcedure,
-    LexXrpcQuery,
-)
-from atproto.nsid import NSID
+from atproto_codegen.utils import get_code_intent as _
 
-_NAMESPACES_OUTPUT_DIR = Path(__file__).parent.parent.parent.joinpath('xrpc_client', 'namespaces')
+_NAMESPACES_OUTPUT_DIR = Path(__file__).parent.parent.parent.joinpath('atproto_client', 'namespaces')
 
 _NAMESPACES_SYNC_FILENAME = 'sync_ns.py'
 _NAMESPACES_ASYNC_FILENAME = 'async_ns.py'
@@ -51,13 +54,13 @@ def _get_namespace_imports() -> str:
         DISCLAIMER,
         'import typing as t',
         '',
-        'from atproto.xrpc_client import models',
-        'from atproto.xrpc_client.models.utils import get_or_create, get_response_model',
-        'from atproto.xrpc_client.namespaces.base import AsyncNamespaceBase, DefaultNamespace, NamespaceBase',
+        'from atproto_client import models',
+        'from atproto_client.models.utils import get_or_create, get_response_model',
+        'from atproto_client.namespaces.base import AsyncNamespaceBase, DefaultNamespace, NamespaceBase',
         '',
         'if t.TYPE_CHECKING:',
-        f'{_(1)}from atproto.xrpc_client.client.async_raw import AsyncClientRaw',
-        f'{_(1)}from atproto.xrpc_client.client.raw import ClientRaw',
+        f'{_(1)}from atproto_client.client.async_raw import AsyncClientRaw',
+        f'{_(1)}from atproto_client.client.raw import ClientRaw',
     ]
 
     return join_code(lines)
diff --git a/atproto/codegen/__init__.py b/packages/atproto_codegen/utils.py
similarity index 85%
rename from atproto/codegen/__init__.py
rename to packages/atproto_codegen/utils.py
index 616f9b97..15e5f07c 100644
--- a/atproto/codegen/__init__.py
+++ b/packages/atproto_codegen/utils.py
@@ -3,23 +3,8 @@
 import typing as t
 from pathlib import Path
 
-from atproto.exceptions import InvalidNsidError
-from atproto.nsid import NSID
-
-_DISCLAIMER_LINES = [
-    "# THIS IS THE AUTO-GENERATED CODE. DON'T EDIT IT BY HANDS!",
-    '# Copyright (C) 2023 Ilya (Marshal) <https://github.com/MarshalX>.',
-    '# This file is part of Python atproto SDK. Licenced under MIT.',
-]
-_MAX_DISCLAIMER_LEN = max([len(s) for s in _DISCLAIMER_LINES])
-DISCLAIMER = '\n'.join(_DISCLAIMER_LINES)
-DISCLAIMER = f'{"#" * _MAX_DISCLAIMER_LEN}\n{DISCLAIMER}\n{"#" * _MAX_DISCLAIMER_LEN}\n\n'
-
-PARAMS_MODEL = 'Params'
-PARAMS_DICT = 'ParamsDict'
-INPUT_MODEL = 'Data'
-INPUT_DICT = 'DataDict'
-OUTPUT_MODEL = 'Response'
+from atproto_core.exceptions import InvalidNsidError
+from atproto_core.nsid import NSID
 
 
 def format_code(filepath: Path, quiet: bool = True) -> None:
diff --git a/atproto/xrpc_client/namespaces/__init__.py b/packages/atproto_core/__init__.py
similarity index 100%
rename from atproto/xrpc_client/namespaces/__init__.py
rename to packages/atproto_core/__init__.py
diff --git a/packages/atproto_core/car/__init__.py b/packages/atproto_core/car/__init__.py
new file mode 100644
index 00000000..0964c39f
--- /dev/null
+++ b/packages/atproto_core/car/__init__.py
@@ -0,0 +1,3 @@
+from .car import CAR
+
+__all__ = ['CAR']
diff --git a/atproto/car/__init__.py b/packages/atproto_core/car/car.py
similarity index 95%
rename from atproto/car/__init__.py
rename to packages/atproto_core/car/car.py
index 5731d8b0..cbd41eb1 100644
--- a/atproto/car/__init__.py
+++ b/packages/atproto_core/car/car.py
@@ -2,8 +2,8 @@
 
 import libipld
 
-from atproto.cid import CID
-from atproto.exceptions import InvalidCARFile
+from atproto_core.cid import CID
+from atproto_core.exceptions import InvalidCARFile
 
 Blocks = t.Dict[CID, dict]
 
diff --git a/packages/atproto_core/cbor/__init__.py b/packages/atproto_core/cbor/__init__.py
new file mode 100644
index 00000000..902dbb39
--- /dev/null
+++ b/packages/atproto_core/cbor/__init__.py
@@ -0,0 +1,3 @@
+from .cbor import decode_dag, decode_dag_multi
+
+__all__ = ['decode_dag', 'decode_dag_multi']
diff --git a/atproto/cbor/__init__.py b/packages/atproto_core/cbor/cbor.py
similarity index 93%
rename from atproto/cbor/__init__.py
rename to packages/atproto_core/cbor/cbor.py
index 9eef5c49..f070ba31 100644
--- a/atproto/cbor/__init__.py
+++ b/packages/atproto_core/cbor/cbor.py
@@ -2,7 +2,7 @@
 
 import libipld
 
-from atproto.exceptions import DAGCBORDecodingError
+from atproto_core.exceptions import DAGCBORDecodingError
 
 
 def decode_dag(data: bytes) -> dict:
diff --git a/packages/atproto_core/cid/__init__.py b/packages/atproto_core/cid/__init__.py
new file mode 100644
index 00000000..09777cc2
--- /dev/null
+++ b/packages/atproto_core/cid/__init__.py
@@ -0,0 +1,6 @@
+from .cid import CID, CIDType
+
+__all__ = [
+    'CID',
+    'CIDType'
+]
diff --git a/atproto/cid/__init__.py b/packages/atproto_core/cid/cid.py
similarity index 100%
rename from atproto/cid/__init__.py
rename to packages/atproto_core/cid/cid.py
diff --git a/packages/atproto_core/exceptions.py b/packages/atproto_core/exceptions.py
new file mode 100644
index 00000000..221e739d
--- /dev/null
+++ b/packages/atproto_core/exceptions.py
@@ -0,0 +1,18 @@
+class AtProtocolError(Exception):
+    """Base exception"""
+
+
+class InvalidNsidError(AtProtocolError):
+    ...
+
+
+class InvalidAtUriError(AtProtocolError):
+    ...
+
+
+class InvalidCARFile(AtProtocolError):
+    ...
+
+
+class DAGCBORDecodingError(AtProtocolError):
+    ...
diff --git a/packages/atproto_core/nsid/__init__.py b/packages/atproto_core/nsid/__init__.py
new file mode 100644
index 00000000..bca10eca
--- /dev/null
+++ b/packages/atproto_core/nsid/__init__.py
@@ -0,0 +1,3 @@
+from .nsid import NSID, validate_nsid
+
+__all__ = ['NSID', 'validate_nsid']
diff --git a/atproto/nsid/__init__.py b/packages/atproto_core/nsid/nsid.py
similarity index 98%
rename from atproto/nsid/__init__.py
rename to packages/atproto_core/nsid/nsid.py
index d7c283fd..c88af541 100644
--- a/atproto/nsid/__init__.py
+++ b/packages/atproto_core/nsid/nsid.py
@@ -2,7 +2,7 @@
 import typing as t
 from dataclasses import dataclass, field
 
-from atproto.exceptions import InvalidNsidError
+from atproto_core.exceptions import InvalidNsidError
 
 _NSID_DELIM = '.'
 _NSID_NAMESPACE = '*'
diff --git a/packages/atproto_core/uri/__init__.py b/packages/atproto_core/uri/__init__.py
new file mode 100644
index 00000000..2a4778e7
--- /dev/null
+++ b/packages/atproto_core/uri/__init__.py
@@ -0,0 +1,3 @@
+from .uri import AtUri
+
+__all__ = ['AtUri']
diff --git a/atproto/uri/__init__.py b/packages/atproto_core/uri/uri.py
similarity index 98%
rename from atproto/uri/__init__.py
rename to packages/atproto_core/uri/uri.py
index a6ade3d2..95ea7860 100644
--- a/atproto/uri/__init__.py
+++ b/packages/atproto_core/uri/uri.py
@@ -3,7 +3,7 @@
 import urllib.parse as urlparse
 from urllib.parse import urlencode
 
-from atproto.exceptions import InvalidAtUriError
+from atproto_core.exceptions import InvalidAtUriError
 
 # ref: https://github.com/bluesky-social/atproto/blob/8c19ce991a766fd9cff5023160853ab1cb106f21/packages/uri/src/index.ts#LL5C38-L5C38
 _ATP_URI_REGEX = r'^(at:\/\/)?((?:did:[a-z0-9:%-]+)|(?:[a-z][a-z0-9.:-]*))(\/[^?#\s]*)?(\?[^#\s]+)?(#[^\s]+)?$'
diff --git a/packages/atproto_firehose/__init__.py b/packages/atproto_firehose/__init__.py
new file mode 100644
index 00000000..e01619c5
--- /dev/null
+++ b/packages/atproto_firehose/__init__.py
@@ -0,0 +1,17 @@
+from .firehose import (
+    AsyncFirehoseSubscribeLabelsClient,
+    AsyncFirehoseSubscribeReposClient,
+    FirehoseSubscribeLabelsClient,
+    FirehoseSubscribeReposClient,
+    parse_subscribe_labels_message,
+    parse_subscribe_repos_message,
+)
+
+__all__ = [
+    'AsyncFirehoseSubscribeLabelsClient',
+    'AsyncFirehoseSubscribeReposClient',
+    'FirehoseSubscribeLabelsClient',
+    'FirehoseSubscribeReposClient',
+    'parse_subscribe_labels_message',
+    'parse_subscribe_repos_message',
+]
diff --git a/atproto/firehose/client.py b/packages/atproto_firehose/client.py
similarity index 95%
rename from atproto/firehose/client.py
rename to packages/atproto_firehose/client.py
index 378ab8c3..d088a4cb 100644
--- a/atproto/firehose/client.py
+++ b/packages/atproto_firehose/client.py
@@ -8,6 +8,10 @@
 from copy import deepcopy
 from urllib.parse import urlencode
 
+from atproto_client.models import get_model_as_dict
+from atproto_client.models.base import ParamsModelBase
+from atproto_client.models.common import XrpcError
+from atproto_core.exceptions import DAGCBORDecodingError
 from websockets.client import connect as aconnect
 from websockets.exceptions import (
     ConnectionClosedError,
@@ -18,11 +22,8 @@
 )
 from websockets.sync.client import connect
 
-from atproto.exceptions import DAGCBORDecodingError, FirehoseDecodingError, FirehoseError
-from atproto.firehose.models import ErrorFrame, Frame, MessageFrame
-from atproto.xrpc_client.models import get_model_as_dict
-from atproto.xrpc_client.models.base import ParamsModelBase
-from atproto.xrpc_client.models.common import XrpcError
+from atproto_firehose.exceptions import FirehoseDecodingError, FirehoseError
+from atproto_firehose.models import ErrorFrame, Frame, MessageFrame
 
 _BASE_WEBSOCKET_URI = 'wss://bsky.network/xrpc'
 _MAX_MESSAGE_SIZE_BYTES = 1024 * 1024 * 5  # 5MB
@@ -54,7 +55,7 @@ def _build_websocket_uri(
 
 def _handle_frame_decoding_error(exception: Exception) -> None:
     if isinstance(exception, (DAGCBORDecodingError, FirehoseDecodingError)):
-        # Ignore an invalid firehose frame that could not be properly decoded.
+        # Ignore an invalid atproto_firehose frame that could not be properly decoded.
         # It's better to ignore one frame rather than stop the whole connection
         # or trap into an infinite loop of reconnections.
         return
diff --git a/packages/atproto_firehose/exceptions.py b/packages/atproto_firehose/exceptions.py
new file mode 100644
index 00000000..93f27643
--- /dev/null
+++ b/packages/atproto_firehose/exceptions.py
@@ -0,0 +1,9 @@
+from atproto_core.exceptions import AtProtocolError
+
+
+class FirehoseError(AtProtocolError):
+    ...
+
+
+class FirehoseDecodingError(FirehoseError):
+    ...
diff --git a/atproto/firehose/__init__.py b/packages/atproto_firehose/firehose.py
similarity index 83%
rename from atproto/firehose/__init__.py
rename to packages/atproto_firehose/firehose.py
index 0f293051..89e7f1df 100644
--- a/atproto/firehose/__init__.py
+++ b/packages/atproto_firehose/firehose.py
@@ -1,11 +1,12 @@
 import typing as t
 
-from atproto.firehose.client import AsyncFirehoseClient, FirehoseClient
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models.utils import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models.utils import get_model_as_dict, get_or_create
+
+from atproto_firehose.client import AsyncFirehoseClient, FirehoseClient
 
 if t.TYPE_CHECKING:
-    from atproto.firehose.models import MessageFrame
+    from atproto_firehose.models import MessageFrame
 
 # TODO(MarshalX): Everything here could be autogenerated from the lexicon.
 
@@ -74,9 +75,9 @@ class FirehoseSubscribeReposClient(FirehoseClient):
     """
 
     def __init__(
-        self,
-        params: t.Optional[t.Union[dict, 'models.ComAtprotoSyncSubscribeRepos.Params']] = None,
-        base_uri: t.Optional[str] = None,
+            self,
+            params: t.Optional[t.Union[dict, 'models.ComAtprotoSyncSubscribeRepos.Params']] = None,
+            base_uri: t.Optional[str] = None,
     ) -> None:
         params_model = get_or_create(params, models.ComAtprotoSyncSubscribeRepos.Params)
 
@@ -96,9 +97,9 @@ class AsyncFirehoseSubscribeReposClient(AsyncFirehoseClient):
     """
 
     def __init__(
-        self,
-        params: t.Optional[t.Union[dict, 'models.ComAtprotoSyncSubscribeRepos.Params']] = None,
-        base_uri: t.Optional[str] = None,
+            self,
+            params: t.Optional[t.Union[dict, 'models.ComAtprotoSyncSubscribeRepos.Params']] = None,
+            base_uri: t.Optional[str] = None,
     ) -> None:
         params_model = get_or_create(params, models.ComAtprotoSyncSubscribeRepos.Params)
 
@@ -121,9 +122,9 @@ class FirehoseSubscribeLabelsClient(FirehoseClient):
     """
 
     def __init__(
-        self,
-        params: t.Optional[t.Union[dict, 'models.ComAtprotoLabelSubscribeLabels.Params']] = None,
-        base_uri: t.Optional[str] = None,
+            self,
+            params: t.Optional[t.Union[dict, 'models.ComAtprotoLabelSubscribeLabels.Params']] = None,
+            base_uri: t.Optional[str] = None,
     ) -> None:
         params_model = get_or_create(params, models.ComAtprotoLabelSubscribeLabels.Params)
 
@@ -143,9 +144,9 @@ class AsyncFirehoseSubscribeLabelsClient(AsyncFirehoseClient):
     """
 
     def __init__(
-        self,
-        params: t.Optional[t.Union[dict, 'models.ComAtprotoLabelSubscribeLabels.Params']] = None,
-        base_uri: t.Optional[str] = None,
+            self,
+            params: t.Optional[t.Union[dict, 'models.ComAtprotoLabelSubscribeLabels.Params']] = None,
+            base_uri: t.Optional[str] = None,
     ) -> None:
         params_model = get_or_create(params, models.ComAtprotoLabelSubscribeLabels.Params)
 
diff --git a/atproto/firehose/models.py b/packages/atproto_firehose/models.py
similarity index 94%
rename from atproto/firehose/models.py
rename to packages/atproto_firehose/models.py
index dbc756cc..375dd43b 100644
--- a/atproto/firehose/models.py
+++ b/packages/atproto_firehose/models.py
@@ -2,9 +2,11 @@
 from enum import Enum
 from typing import Optional, Union
 
-from atproto.cbor import decode_dag_multi
-from atproto.exceptions import AtProtocolError, FirehoseDecodingError
-from atproto.xrpc_client.models.utils import get_or_create
+from atproto_client.models.utils import get_or_create
+from atproto_core.cbor import decode_dag_multi
+from atproto_core.exceptions import AtProtocolError
+
+from atproto_firehose.exceptions import FirehoseDecodingError
 
 
 class FrameType(Enum):
diff --git a/packages/atproto_lexicon/__init__.py b/packages/atproto_lexicon/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/atproto_lexicon/exceptions.py b/packages/atproto_lexicon/exceptions.py
new file mode 100644
index 00000000..4dc36202
--- /dev/null
+++ b/packages/atproto_lexicon/exceptions.py
@@ -0,0 +1,5 @@
+from atproto_core.exceptions import AtProtocolError
+
+
+class LexiconParsingError(AtProtocolError):
+    ...
diff --git a/atproto/lexicon/models.py b/packages/atproto_lexicon/models.py
similarity index 100%
rename from atproto/lexicon/models.py
rename to packages/atproto_lexicon/models.py
diff --git a/atproto/lexicon/parser.py b/packages/atproto_lexicon/parser.py
similarity index 94%
rename from atproto/lexicon/parser.py
rename to packages/atproto_lexicon/parser.py
index 540c655c..3393194d 100644
--- a/atproto/lexicon/parser.py
+++ b/packages/atproto_lexicon/parser.py
@@ -3,8 +3,8 @@
 import typing as t
 from pathlib import Path
 
-from atproto.exceptions import LexiconParsingError
-from atproto.lexicon import models
+from atproto_lexicon import models
+from atproto_lexicon.exceptions import LexiconParsingError
 
 _PATH_TO_LEXICONS = Path(__file__).parent.parent.parent.joinpath('lexicons').absolute()
 _LEXICON_FILE_EXT = '.json'
diff --git a/atproto/xrpc_server/__init__.py b/packages/atproto_server/__init__.py
similarity index 100%
rename from atproto/xrpc_server/__init__.py
rename to packages/atproto_server/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
index af456a95..a3d01b6c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,6 +25,16 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Pre-processors",
 ]
+packages = [
+    { include = "atproto", from = "packages" },
+    { include = "atproto_cli", from = "packages" },
+    { include = "atproto_client", from = "packages" },
+    { include = "atproto_codegen", from = "packages" },
+    { include = "atproto_core", from = "packages" },
+    { include = "atproto_firehose", from = "packages" },
+    { include = "atproto_lexicon", from = "packages" },
+    { include = "atproto_server", from = "packages" },
+]
 
 [tool.poetry.urls]
 "Documentation" = "https://atproto.blue"
@@ -33,8 +43,8 @@ classifiers = [
 "Author" = "https://github.com/MarshalX"
 
 [tool.poetry.scripts]
-atp = "atproto.cli:atproto_cli"
-atproto = "atproto.cli:atproto_cli"
+atp = "atproto_cli:atproto_cli"
+atproto = "atproto_cli:atproto_cli"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1,<3.13"
@@ -124,11 +134,12 @@ ignore = [
 "tests/*.py" = ["S101"]
 "docs/*.py" = ["T201", "INP001", "ERA001", "E501"]
 "examples/*.py" = ["T201", "INP001", "ERA001"]
-"atproto/xrpc_client/models/__init__.py" = ["F401", "F811"]
-"atproto/xrpc_client/models/app/*.py" = ["E501"]
-"atproto/xrpc_client/models/com/*.py" = ["E501"]
-"atproto/xrpc_client/namespaces/async_ns.py" = ["E501"]
-"atproto/xrpc_client/namespaces/sync_ns.py" = ["E501"]
+"packages/atproto/exceptions.py" = ["F403"]
+"packages/atproto_client/models/__init__.py" = ["F401", "F811"]
+"packages/atproto_client/models/app/*.py" = ["E501"]
+"packages/atproto_client/models/com/*.py" = ["E501"]
+"packages/atproto_client/namespaces/async_ns.py" = ["E501"]
+"packages/atproto_client/namespaces/sync_ns.py" = ["E501"]
 "fetch_new_lexicon.py" = ["T201"]
 "test.py" = ["S101", "ERA001", "T201", "E501", "F401"]
 
diff --git a/test.py b/test.py
index 00a7c662..f1efdefa 100644
--- a/test.py
+++ b/test.py
@@ -4,17 +4,22 @@
 import threading
 import typing as t
 
-from atproto import CAR, AsyncClient, AtUri, Client, exceptions, models
-from atproto.firehose import (
+from atproto import (
+    CAR,
+    AsyncClient,
     AsyncFirehoseSubscribeReposClient,
+    AtUri,
+    Client,
     FirehoseSubscribeReposClient,
+    exceptions,
+    models,
     parse_subscribe_repos_message,
 )
-from atproto.utils import TextBuilder
-from atproto.xrpc_client.models import get_model_as_dict, get_model_as_json, get_or_create, ids, is_record_type
+from atproto_client.models import get_model_as_dict, get_model_as_json, get_or_create, ids, is_record_type
+from atproto_client.utils import TextBuilder
 
 if t.TYPE_CHECKING:
-    from atproto.firehose import MessageFrame
+    from atproto_firehose.models import MessageFrame
 
 # logging.basicConfig(level=logging.DEBUG)
 logging.basicConfig(level=logging.INFO)
@@ -41,6 +46,28 @@ def sync_main() -> None:
     client = Client()
     client.login(os.environ['USERNAME'], os.environ['PASSWORD'])
 
+
+    post = client.get_post('3k2yihcrp6f2c')
+    print(post)
+    exit(0)
+
+    with open('cat2.jpg', 'rb') as f:
+        cat_data = f.read()
+
+    upload = client.upload_blob(cat_data)
+    embed_external = models.AppBskyEmbedExternal.Main(
+        external=models.AppBskyEmbedExternal.External(
+            title='Test title',
+            description='Test description',
+            uri='https://atproto.blue',
+            thumb=upload.blob,
+        )
+    )
+
+    client.send_post('test external with thumb', embed=embed_external)
+
+    exit(0)
+
     post = client.get_post('3k2yihcrp6f2c')
     # print(client.get_posts(['at://did:plc:kvwvcn5iqfooopmyzvb4qzba/app.bsky.feed.post/3k2yihcrp6f2c']))
     # print(client.get_post_thread('at://did:plc:kvwvcn5iqfooopmyzvb4qzba/app.bsky.feed.post/3k2yihcrp6f2c'))
@@ -53,17 +80,17 @@ def sync_main() -> None:
     # print(client.follow('did:plc:kvwvcn5iqfooopmyzvb4qzba'))
     # print(client.unfollow('at://did:plc:kvwvcn5iqfooopmyzvb4qzba/app.bsky.graph.follow/3kgqtrsry3u2y'))
 
-    # params = models.AppBskyGraphGetSuggestedFollowsByActor.Params(actor='test.marshal.dev')
-    # result = client.app.bsky.graph.get_suggested_follows_by_actor(params)
-    # print(result)
+    params = models.AppBskyGraphGetSuggestedFollowsByActor.Params(actor='test.marshal.dev')
+    result = client.app.bsky.graph.get_suggested_follows_by_actor(params)
+    print(result)
     # print(client.get_follows('test.marshal.dev'))
     # print(client.get_followers('test.marshal.dev'))
     # print(client.get_profile('test.marshal.dev'))
     # print(client.get_profiles(['test.marshal.dev', 'marshal.dev']))
     # client.mute('test.marshal.dev')
     # client.unmute('test.marshal.dev'))
-    print(client.resolve_handle('bsky.app'))
-    print(client.upload_blob(b'lol'))
+    # print(client.resolve_handle('bsky.app'))
+    # print(client.upload_blob(b'lol'))
     exit(0)
 
     # client.send_post(TextBuilder().text('Test msg using ').link('Python SDK', 'https://atproto.blue/'))
@@ -162,8 +189,8 @@ async def main() -> None:
     profile = await async_client.login(os.environ['USERNAME'], os.environ['PASSWORD'])
     print(profile)
 
-    text = TextBuilder().text('Hello World from ').link('Python SDK', 'https://atproto.blue')
-    await async_client.send_post(text)
+    # text = TextBuilder().text('Hello World from ').link('Python SDK', 'https://atproto.blue')
+    # await async_client.send_post(text)
 
     # should be async open
     # with open('cat.png', 'rb') as f:
@@ -171,10 +198,10 @@ async def main() -> None:
 
     # await async_client.send_image('Cat', cat_data, 'async cat alt')
 
-    # resolve = await async_client.com.atproto.identity.resolve_handle(
-    #     models.ComAtprotoIdentityResolveHandle.Params(profile.handle)
-    # )
-    # assert resolve.did == profile.did
+    resolve = await async_client.com.atproto.identity.resolve_handle(
+        models.ComAtprotoIdentityResolveHandle.Params(handle=profile.handle)
+    )
+    assert resolve.did == profile.did
 
 
 def _main_firehose_test() -> None:
diff --git a/tests/models/fetch_test_data.py b/tests/models/fetch_test_data.py
index 8b542789..eddfc872 100644
--- a/tests/models/fetch_test_data.py
+++ b/tests/models/fetch_test_data.py
@@ -3,11 +3,11 @@
 import os
 import typing as t
 
-from atproto import Client
-from atproto.xrpc_client.request import Request, Response
+from atproto_client import Client
+from atproto_client.request import Request, Response
 
 if t.TYPE_CHECKING:
-    from atproto.xrpc_client.models.common import XrpcError
+    from atproto_client.models.common import XrpcError
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/tests/models/tests/test_changed_lexicon_compatability.py b/tests/models/tests/test_changed_lexicon_compatability.py
index 233ab86d..27ea396b 100644
--- a/tests/models/tests/test_changed_lexicon_compatability.py
+++ b/tests/models/tests/test_changed_lexicon_compatability.py
@@ -1,8 +1,7 @@
 import pytest
-
-from atproto.exceptions import ModelError
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_or_create
+from atproto_client import models
+from atproto_client.exceptions import ModelError
+from atproto_client.models import get_or_create
 
 """These tests are based on the following statements:
 
diff --git a/tests/models/tests/test_custom_record.py b/tests/models/tests/test_custom_record.py
index 2a3bb0a4..06dcc2f5 100644
--- a/tests/models/tests/test_custom_record.py
+++ b/tests/models/tests/test_custom_record.py
@@ -1,6 +1,7 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
-from atproto.xrpc_client.models.dot_dict import DotDict
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+from atproto_client.models.dot_dict import DotDict
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_did_doc.py b/tests/models/tests/test_did_doc.py
index 8478af62..dc558676 100644
--- a/tests/models/tests/test_did_doc.py
+++ b/tests/models/tests/test_did_doc.py
@@ -1,6 +1,7 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_or_create
-from atproto.xrpc_client.models.dot_dict import DotDict
+from atproto_client import models
+from atproto_client.models import get_or_create
+from atproto_client.models.dot_dict import DotDict
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_dot_dict.py b/tests/models/tests/test_dot_dict.py
index be4983e4..3dad4df7 100644
--- a/tests/models/tests/test_dot_dict.py
+++ b/tests/models/tests/test_dot_dict.py
@@ -1,4 +1,4 @@
-from atproto.xrpc_client.models.dot_dict import DotDict
+from atproto_client.models.dot_dict import DotDict
 
 
 def test_dot_dict() -> None:
diff --git a/tests/models/tests/test_extended_like_record.py b/tests/models/tests/test_extended_like_record.py
index 3a5e831c..96919914 100644
--- a/tests/models/tests/test_extended_like_record.py
+++ b/tests/models/tests/test_extended_like_record.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_extended_post_record.py b/tests/models/tests/test_extended_post_record.py
index e25a2a7d..65fb9f6e 100644
--- a/tests/models/tests/test_extended_post_record.py
+++ b/tests/models/tests/test_extended_post_record.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_feed_record.py b/tests/models/tests/test_feed_record.py
index 8213a748..28c05e08 100644
--- a/tests/models/tests/test_feed_record.py
+++ b/tests/models/tests/test_feed_record.py
@@ -1,9 +1,9 @@
 import pytest
+from atproto_client import models
+from atproto_client.models import dot_dict, get_model_as_dict, get_or_create
+from atproto_client.models.blob_ref import BlobRef
 from pydantic import ValidationError
 
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import dot_dict, get_model_as_dict, get_or_create
-from atproto.xrpc_client.models.blob_ref import BlobRef
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_get_follows.py b/tests/models/tests/test_get_follows.py
index 9be7b2cf..0c990e33 100644
--- a/tests/models/tests/test_get_follows.py
+++ b/tests/models/tests/test_get_follows.py
@@ -1,7 +1,8 @@
 import typing as t
 
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_is_record_type.py b/tests/models/tests/test_is_record_type.py
index 4f344671..451df0d4 100644
--- a/tests/models/tests/test_is_record_type.py
+++ b/tests/models/tests/test_is_record_type.py
@@ -1,6 +1,7 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_or_create, is_record_type
-from atproto.xrpc_client.models.dot_dict import DotDict
+from atproto_client import models
+from atproto_client.models import get_or_create, is_record_type
+from atproto_client.models.dot_dict import DotDict
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_like_record.py b/tests/models/tests/test_like_record.py
index 4db8a056..4f3f153b 100644
--- a/tests/models/tests/test_like_record.py
+++ b/tests/models/tests/test_like_record.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_post_record.py b/tests/models/tests/test_post_record.py
index adaf1c30..b61d73fa 100644
--- a/tests/models/tests/test_post_record.py
+++ b/tests/models/tests/test_post_record.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_resolve_handle.py b/tests/models/tests/test_resolve_handle.py
index f1116ec3..17635f77 100644
--- a/tests/models/tests/test_resolve_handle.py
+++ b/tests/models/tests/test_resolve_handle.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/models/tests/test_thread_view_post_with_embed_media.py b/tests/models/tests/test_thread_view_post_with_embed_media.py
index 5a8a6512..5969cdd9 100644
--- a/tests/models/tests/test_thread_view_post_with_embed_media.py
+++ b/tests/models/tests/test_thread_view_post_with_embed_media.py
@@ -1,5 +1,6 @@
-from atproto.xrpc_client import models
-from atproto.xrpc_client.models import get_model_as_dict, get_or_create
+from atproto_client import models
+from atproto_client.models import get_model_as_dict, get_or_create
+
 from tests.models.tests.utils import load_data_from_file
 
 
diff --git a/tests/test_lexicon_parser.py b/tests/test_lexicon_parser.py
index 6dc1b13d..b9ce57e2 100644
--- a/tests/test_lexicon_parser.py
+++ b/tests/test_lexicon_parser.py
@@ -1,4 +1,4 @@
-from atproto.lexicon.parser import _PATH_TO_LEXICONS, lexicon_parse_file, lexicon_parse_dir  # noqa
+from atproto_lexicon.parser import _PATH_TO_LEXICONS, lexicon_parse_file, lexicon_parse_dir  # noqa
 
 
 def test_lexicon_parse_file() -> None:
diff --git a/tests/test_nsid.py b/tests/test_nsid.py
index 9815ba6e..e9bed788 100644
--- a/tests/test_nsid.py
+++ b/tests/test_nsid.py
@@ -1,4 +1,4 @@
-from atproto.nsid import NSID, validate_nsid
+from atproto_core.nsid import NSID, validate_nsid
 
 
 def test_nsid_from_str() -> None:
diff --git a/tests/test_uri.py b/tests/test_uri.py
index 9e36ceb6..d973e1dc 100644
--- a/tests/test_uri.py
+++ b/tests/test_uri.py
@@ -1,4 +1,4 @@
-from atproto import AtUri
+from atproto_core.uri import AtUri
 
 
 def test_at_uri_from_str() -> None: