From 10a5579b5be6aee46933dad9357da8533308e40c Mon Sep 17 00:00:00 2001
From: Rikin Kachhia <54616969+rikinsk@users.noreply.github.com>
Date: Tue, 25 Aug 2020 21:51:21 +0530
Subject: [PATCH] docs: update paths for core and cloud (#5665)

---
 docs/_static/scripts/hdocs.js                 |   4 +--
 docs/_theme/djangodocs/layout.html            |  20 ++++++++++-----
 docs/_theme/djangodocs/pages/landing.html     |   4 +--
 docs/{ => graphql}/cloud/allow-lists.rst      |   4 +--
 docs/{ => graphql}/cloud/api-limits.rst       |   4 +--
 docs/{ => graphql}/cloud/api-reference.rst    |   0
 .../cloud/getting-started/index.rst           |  12 ++++-----
 docs/{ => graphql}/cloud/glossary.rst         |   0
 .../cloud/hasurapro-cli/index.rst             |   0
 docs/{ => graphql}/cloud/index.rst            |   0
 docs/{ => graphql}/cloud/metrics/errors.rst   |   4 +--
 docs/{ => graphql}/cloud/metrics/index.rst    |   2 +-
 .../cloud/metrics/operations.rst              |   4 +--
 docs/{ => graphql}/cloud/metrics/overview.rst |   2 +-
 .../cloud/metrics/subscription-workers.rst    |   2 +-
 docs/{ => graphql}/cloud/metrics/usage.rst    |   4 +--
 .../cloud/metrics/websockets.rst              |   2 +-
 docs/{ => graphql}/cloud/projects/create.rst  |  12 ++++-----
 docs/{ => graphql}/cloud/projects/delete.rst  |   2 +-
 docs/{ => graphql}/cloud/projects/index.rst   |   6 ++---
 .../projects/manage-projects/domains.rst      |  10 ++++----
 .../projects/manage-projects/env-vars.rst     |   2 +-
 .../projects/manage-projects/general.rst      |   2 +-
 .../cloud/projects/manage-projects/index.rst  |   2 +-
 .../cloud/projects/manage-projects/team.rst   |   4 +--
 docs/{ => graphql}/cloud/projects/secure.rst  |   6 ++---
 docs/{ => graphql}/cloud/read-replicas.rst    |   0
 docs/{ => graphql}/cloud/regression-tests.rst |  14 +++++-----
 docs/{ => graphql}/cloud/response-caching.rst |   0
 docs/{ => graphql}/cloud/tracing.rst          |   2 +-
 .../actions/action-examples.rst.wip           |   8 +++---
 .../actions/action-handlers.rst               |   2 +-
 .../actions/action-permissions.rst            |   2 +-
 .../actions/async-actions.rst                 |   0
 .../{manual => core}/actions/codegen.rst      |   8 +++---
 .../{manual => core}/actions/create.rst       |   4 +--
 .../{manual => core}/actions/debugging.rst    |   0
 .../{manual => core}/actions/derive.rst       |   6 ++---
 .../{manual => core}/actions/index.rst        |   2 +-
 .../actions/reuse-types-actions.rst           |   2 +-
 .../{manual => core}/actions/types/index.rst  |   0
 .../{manual => core}/api-reference/config.rst |   0
 .../api-reference/explain.rst                 |   0
 .../api-reference/graphql-api/index.rst       |   0
 .../api-reference/graphql-api/mutation.rst    |   0
 .../api-reference/graphql-api/query.rst       |   0
 .../{manual => core}/api-reference/health.rst |   0
 .../{manual => core}/api-reference/index.rst  |   0
 .../{manual => core}/api-reference/pgdump.rst |   0
 .../api-reference/pgtypes.csv                 |   0
 .../api-reference/postgresql-types.rst        |   0
 .../schema-metadata-api/actions.rst           |   0
 .../schema-metadata-api/computed-field.rst    |   0
 .../schema-metadata-api/custom-functions.rst  |   0
 .../schema-metadata-api/custom-types.rst      |   0
 .../schema-metadata-api/dataerrors.csv        |   0
 .../schema-metadata-api/event-triggers.rst    |   0
 .../schema-metadata-api/index.rst             |   0
 .../schema-metadata-api/manage-metadata.rst   |   0
 .../schema-metadata-api/permission.rst        |   0
 .../schema-metadata-api/query-collections.rst |   0
 .../schema-metadata-api/relationship.rst      |   0
 .../remote-relationships.rst                  |   0
 .../schema-metadata-api/remote-schemas.rst    |   0
 .../schema-metadata-api/run-sql.rst           |   0
 .../scheduled-triggers.rst                    |   0
 .../schema-metadata-api/syntax-defs.rst       |   0
 .../schema-metadata-api/table-view.rst        |   0
 .../api-reference/version.rst                 |   0
 .../auth/authentication/index.rst             |   4 +--
 .../auth/authentication/jwt.rst               |   4 +--
 .../authentication/unauthenticated-access.rst |   0
 .../auth/authentication/webhook.rst           |   2 +-
 .../auth/authorization/basics.rst             |   8 +++---
 .../common-roles-auth-examples.rst            |  24 +++++++++---------
 .../auth/authorization/index.rst              |   2 +-
 .../auth/authorization/modeling-roles.rst.wip |   2 +-
 .../auth/authorization/permission-rules.rst   |  24 +++++++++---------
 .../reference-permissions.rst.wip             |  24 +++++++++---------
 .../authorization/role-multiple-rules.rst     |   6 ++---
 .../auth/authorization/roles-variables.rst    |   2 +-
 .../auth/authorization/use-cases.rst.wip      |  18 ++++++-------
 .../{manual => core}/auth/config.rst.wip      |   0
 docs/graphql/{manual => core}/auth/index.rst  |   2 +-
 .../business-logic/index.rst.wip              |   6 ++---
 .../deployment/allow-list.rst                 |   0
 .../deployment/compression.rst                |   0
 .../deployment/custom-docker-images.rst       |   0
 .../azure-container-instances-postgres.rst    |   0
 .../digital-ocean-one-click.rst               |   0
 .../deployment/deployment-guides/docker.rst   |   0
 .../google-kubernetes-engine-cloud-sql.rst    |   0
 .../deployment/deployment-guides/heroku.rst   |  10 ++++----
 .../deployment/deployment-guides/index.rst    |   2 +-
 .../deployment-guides/kubernetes.rst          |   0
 .../deployment-guides/nhost-one-click.rst     |   0
 .../deployment-guides/render-one-click.rst    |   4 +--
 .../deployment/downgrading.rst                |   0
 .../deployment/enable-https.rst               |   0
 .../graphql-engine-flags/config-examples.rst  |   0
 .../deployment/graphql-engine-flags/index.rst |   0
 .../graphql-engine-flags/reference.rst        |   0
 .../{manual => core}/deployment/index.rst     |   0
 .../{manual => core}/deployment/logging.rst   |   0
 .../deployment/postgres-requirements.rst      |   0
 .../deployment/production-checklist.rst       |   2 +-
 .../deployment/securing-graphql-endpoint.rst  |   0
 .../deployment/updating-graphql-engine.rst    |   0
 .../event-triggers/clean-up.rst               |   0
 .../event-triggers/create-trigger.rst         |   4 +--
 .../{manual => core}/event-triggers/index.rst |   2 +-
 .../event-triggers/invoke-trigger-console.rst |   4 +--
 .../event-triggers/payload.rst                |   0
 .../event-triggers/samples.rst                |   0
 .../event-triggers/serverless.rst             |   0
 .../{manual => core}/faq/index.rst.wip        |   0
 .../getting-started/docker-simple.rst         |   0
 .../getting-started/first-event-trigger.rst   |   6 ++---
 .../getting-started/first-graphql-query.rst   |   4 +--
 .../getting-started/index.rst                 |   2 +-
 .../using-existing-database.rst               |   0
 .../guides/auditing-tables.rst                |   0
 .../guides/code-editor-integrations/index.rst |   0
 .../visual-studio-code.rst                    |   0
 .../guides/data-modelling/index.rst           |   0
 .../guides/data-modelling/soft-deletes.rst    |  10 ++++----
 .../guides/docker-networking.rst              |   0
 .../graphql/{manual => core}/guides/index.rst |   0
 .../integrations/apollo-subscriptions.rst     |   0
 .../guides/integrations/auth-guardian-jwt.rst |  14 +++++-----
 .../guides/integrations/auth0-jwt.rst         |   4 +--
 .../guides/integrations/aws-cognito.rst       |  16 ++++++------
 .../guides/integrations/index.rst             |   0
 .../guides/monitoring/index.rst               |   0
 .../guides/sample-apps/index.rst              |   0
 .../{manual => core}/guides/telemetry.rst     |   0
 .../hasura-cli/config-reference.rst           |   0
 .../{manual => core}/hasura-cli/hasura.rst    |   0
 .../hasura-cli/hasura_actions.rst             |   0
 .../hasura-cli/hasura_actions_codegen.rst     |   0
 .../hasura-cli/hasura_actions_create.rst      |   0
 .../hasura-cli/hasura_actions_use-codegen.rst |   0
 .../hasura-cli/hasura_completion.rst          |   0
 .../hasura-cli/hasura_console.rst             |   0
 .../hasura-cli/hasura_init.rst                |   0
 .../hasura-cli/hasura_metadata.rst            |   0
 .../hasura-cli/hasura_metadata_apply.rst      |   0
 .../hasura-cli/hasura_metadata_clear.rst      |   0
 .../hasura-cli/hasura_metadata_diff.rst       |   0
 .../hasura-cli/hasura_metadata_export.rst     |   0
 .../hasura_metadata_inconsistency.rst         |   0
 .../hasura_metadata_inconsistency_drop.rst    |   0
 .../hasura_metadata_inconsistency_list.rst    |   0
 .../hasura_metadata_inconsistency_status.rst  |   0
 .../hasura-cli/hasura_metadata_reload.rst     |   0
 .../hasura-cli/hasura_migrate.rst             |   0
 .../hasura-cli/hasura_migrate_apply.rst       |   0
 .../hasura-cli/hasura_migrate_create.rst      |   0
 .../hasura-cli/hasura_migrate_squash.rst      |   0
 .../hasura-cli/hasura_migrate_status.rst      |   0
 .../hasura-cli/hasura_plugins.rst             |   0
 .../hasura-cli/hasura_plugins_install.rst     |   0
 .../hasura-cli/hasura_plugins_list.rst        |   0
 .../hasura-cli/hasura_plugins_uninstall.rst   |   0
 .../hasura-cli/hasura_plugins_upgrade.rst     |   0
 .../hasura-cli/hasura_scripts.rst             |   0
 .../hasura_scripts_update-project-v2.rst      |   0
 .../hasura-cli/hasura_seeds.rst               |   0
 .../hasura-cli/hasura_seeds_apply.rst         |   0
 .../hasura-cli/hasura_seeds_create.rst        |   0
 .../hasura-cli/hasura_update-cli.rst          |   0
 .../hasura-cli/hasura_version.rst             |   0
 .../{manual => core}/hasura-cli/index.rst     |   0
 .../hasura-cli/install-hasura-cli.rst         |   0
 .../hasura-cli/uninstall-hasura-cli.rst       |   0
 .../{manual => core}/how-it-works/index.rst   |   0
 .../how-it-works/metadata-schema.rst          |   6 ++---
 docs/graphql/{manual => core}/index.rst       |   0
 .../integration/index.rst.wip                 |   0
 .../introduction/index.rst.wip                |   0
 .../advanced/auto-apply-migrations.rst        |   0
 .../migrations/advanced/collaboration.rst.wip |   0
 .../migrations/advanced/index.rst             |   0
 .../advanced/rolling-back-migrations.rst      |   0
 .../advanced/seed-data-migration.rst          |   0
 .../advanced/writing-migrations-manually.rst  |   0
 .../{manual => core}/migrations/basics.rst    |   0
 .../advanced/auto-apply-migrations.rst        |   0
 .../migrations/config-v1/advanced/index.rst   |   0
 .../advanced/rolling-back-migrations.rst      |   0
 .../advanced/writing-migrations-manually.rst  |   0
 .../migrations/config-v1/index.rst            |   0
 .../migrations/config-v1/manage-metadata.rst  |   0
 .../config-v1/manage-migrations.rst           |   2 +-
 .../migrations/config-v1/reference/index.rst  |   0
 .../reference/metadata-file-format.rst        |   0
 .../reference/migration-file-format.rst       |   0
 .../{manual => core}/migrations/index.rst     |   0
 .../migrations/manage-metadata.rst            |   0
 .../migrations/migrations-setup.rst           |   2 +-
 .../migrations/reference/how-it-works.rst     |   0
 .../migrations/reference/index.rst            |   0
 .../migrations/reference/metadata-format.rst  |   0
 .../reference/migration-file-format.rst       |   0
 .../migrations/upgrade-v2.rst                 |   0
 .../{manual => core}/mutations/delete.rst     |   0
 .../{manual => core}/mutations/index.rst      |   0
 .../{manual => core}/mutations/insert.rst     |   0
 .../mutations/multiple-mutations.rst          |   0
 .../{manual => core}/mutations/update.rst     |   0
 .../{manual => core}/mutations/upsert.rst     |   0
 .../performance/index.rst.wip                 |   0
 .../queries/aggregation-queries.rst           |   0
 .../queries/distinct-queries.rst              |   0
 .../{manual => core}/queries/index.rst        |   0
 .../queries/multiple-arguments.rst            |   0
 .../queries/multiple-queries.rst              |   0
 .../queries/nested-object-queries.rst         |   0
 .../{manual => core}/queries/pagination.rst   |   0
 .../{manual => core}/queries/performance.rst  |   6 ++---
 .../queries/query-filters.rst                 |   0
 .../queries/simple-object-queries.rst         |   0
 .../{manual => core}/queries/sorting.rst      |   0
 ...variables-aliases-fragments-directives.rst |   0
 .../remote-schemas/adding-schema.rst          |   2 +-
 .../{manual => core}/remote-schemas/index.rst |   2 +-
 .../remote-schemas/schema-auth.rst            |   0
 .../create-cron-trigger.rst                   |   8 +++---
 .../create-one-off-scheduled-event.rst        |   8 +++---
 .../scheduled-triggers/index.rst              |   2 +-
 .../{manual => core}/schema/basics.rst        |   2 +-
 .../schema/computed-fields.rst                |   2 +-
 .../schema/custom-field-names.rst             |   4 +--
 .../schema/custom-functions.rst               |   0
 .../schema/data-validations.rst               |  10 ++++----
 .../schema/default-values/column-presets.rst  |   8 +++---
 .../created-updated-timestamps.rst            |   4 +--
 .../schema/default-values/index.rst           |   0
 .../default-values/postgres-defaults.rst      |   2 +-
 .../schema/default-values/sql-functions.rst   |   4 +--
 .../schema/derived-data.rst.wip               |   0
 .../graphql/{manual => core}/schema/enums.rst |   2 +-
 .../schema/export-graphql-schema.rst          |   0
 .../schema/import-database.rst.wip            |   0
 .../graphql/{manual => core}/schema/index.rst |   0
 .../{manual => core}/schema/relay-schema.rst  |   2 +-
 .../action-relationships.rst                  |   4 +--
 .../schema/remote-relationships/index.rst     |   0
 .../remote-schema-relationships.rst           |   4 +--
 .../schema/table-relationships/create.rst     |  10 ++++----
 .../database-modelling/index.rst              |   0
 .../database-modelling/many-to-many.rst       |   0
 .../database-modelling/one-to-many.rst        |   0
 .../database-modelling/one-to-one.rst         |   0
 .../schema/table-relationships/index.rst      |   0
 .../schema/table-relationships/rename.rst     |   0
 .../schema/using-existing-database.rst        |   0
 .../graphql/{manual => core}/schema/views.rst |   0
 .../security-disclosure/index.rst             |   0
 .../{manual => core}/subscriptions/index.rst  |   0
 .../subscriptions/use-cases.rst               |   0
 .../troubleshooting/index.rst                 |   0
 .../version-control/index.rst.wip             |   0
 .../cloud/getting-started/connect-db.png      | Bin
 .../getting-started/connect-existing-db.png   | Bin
 .../create-project-existing-db.png            | Bin
 .../getting-started/create-project-new-db.png | Bin
 .../cloud/getting-started/project-actions.png | Bin
 .../project-functionalities.png               | Bin
 .../cloud/metrics/inspect-error.png           | Bin
 .../cloud/metrics/pro-tab-errors.png          | Bin
 .../metrics/pro-tab-operations-inspect.png    | Bin
 .../cloud/metrics/pro-tab-operations.png      | Bin
 .../cloud/metrics/pro-tab-overview.png        | Bin
 .../metrics/pro-tab-subscription-workers.png  | Bin
 .../cloud/metrics/pro-tab-usage.png           | Bin
 .../cloud/metrics/pro-tab-websockets.png      | Bin
 .../cloud/projects/add-collaborator.png       | Bin
 .../cloud/projects/add-custom-domain.png      | Bin
 .../cloud/projects/add-env-var.png            | Bin
 .../cloud/projects/choose-custom-domain.png   | Bin
 .../cloud/projects/cloud-create-project.png   | Bin
 .../projects/cloud-project-invitation.png     | Bin
 .../projects/cloud-projects-dashboard.png     | Bin
 .../cloud/projects/create-new-project.png     | Bin
 .../cloud/projects/create-project-heroku.png  | Bin
 .../cloud/projects/dns-settings.png           | Bin
 .../cloud/projects/dns-validated.png          | Bin
 .../cloud/projects/dns-validation-pending.png | Bin
 .../cloud/projects/existing-db-setup.png      | Bin
 .../gcp-postgres-authorized-network.png       | Bin
 .../cloud/projects/hasura-cloud-ip.png        | Bin
 .../cloud/projects/manage-project.png         | Bin
 .../cloud/projects/new-project-hosted.png     | Bin
 .../projects/new-project-self-hosted.png      | Bin
 .../cloud/projects/project-details.png        | Bin
 .../cloud/projects/projects-delete.png        | Bin
 .../cloud/projects/projects-list.png          | Bin
 .../cloud/projects/secure-add-envvar.png      | Bin
 .../cloud/projects/secure-envvars.png         | Bin
 .../cloud/projects/secure-settings.png        | Bin
 .../cloud/projects/team-view.png              | Bin
 .../regression-testing-diagram.png            | Bin
 .../regression-tests-add-operations.png       | Bin
 .../regression-tests-past-runs.png            | Bin
 .../reliability/regression-tests-results.png  | Bin
 .../reliability/regression-tests-run-cli.png  | Bin
 .../regression-tests-run-tests.png            | Bin
 .../reliability/regression-tests-suites.png   | Bin
 .../regressions-run-prod-tests-on-dev.png     | Bin
 .../cloud/security/allowlist-add-new-op.png   | Bin
 .../security/pro-tab-apilimit-config.png      | Bin
 .../cloud/security/pro-tab-apilimits.png      | Bin
 .../cloud/security/pro-tabs-allowlist.png     | Bin
 .../tracing/tracing-operations-timing.png     | Bin
 .../actions/action-array-relationship.png     | Bin
 .../actions/action-object-relationship.png    | Bin
 .../actions/action-secret-header.png          | Bin
 .../{manual => core}/actions/actions-arch.png | Bin
 .../actions/actions-derive-button.png         | Bin
 .../actions/actions-derive-codegen.png        | Bin
 .../actions/actions-derive-types.png          | Bin
 .../actions/actions-permissions.png           | Bin
 .../actions/actions-relationship.png          | Bin
 .../actions/cli-framework-prompt.png          | Bin
 .../actions/cli-output-dir-prompt.png         | Bin
 .../actions/cli-starter-kit-prompt.png        | Bin
 .../actions/console-codegen-tab.png           | Bin
 .../actions/mutation-action-create.png        | Bin
 .../actions/query-action-create.png           | Bin
 .../update-address-action-definition.png      | Bin
 .../update-author-action-definition.png       | Bin
 .../auth/aggregation-query-permissions.png    | Bin
 .../auth/anonymous-role-examples.png          | Bin
 .../auth/array-relationship-reviewers.png     | Bin
 .../auth/auth-high-level-overview.png         | Bin
 .../auth/auth-jwt-overview.png                | Bin
 .../auth/auth-webhook-overview.png            | Bin
 .../auth/author-insert-permissions.png        | Bin
 .../auth/author-select-perms.png              | Bin
 .../{manual => core}/auth/author-table.png    | Bin
 .../auth/boolean-operators.png                | Bin
 .../auth/collaborator-relationship.png        | Bin
 .../auth/column-level-permissions.png         | Bin
 .../auth/composite-boolean-expression.png     | Bin
 .../{manual => core}/auth/dev-mode-auth.png   | Bin
 .../auth/dev-mode-role-header-access-key.png  | Bin
 .../auth/dev-mode-role-header.png             | Bin
 .../auth/exists-permission-example.png        | Bin
 .../{manual => core}/auth/fetch-authors.png   | Bin
 .../auth/github-org-hierarchical-roles.png    | Bin
 .../{manual => core}/auth/hasura-perms.png    | Bin
 .../{manual => core}/auth/jwt-auth.png        | Bin
 .../auth/jwt-config-generated.png             | Bin
 .../{manual => core}/auth/limit-results.png   | Bin
 .../auth/limit-rows-for-select.png            | Bin
 ...tiple-rules-create-manual-relationship.png | Bin
 ...tiple-rules-define-private-permissions.png | Bin
 ...ltiple-rules-define-public-permissions.png | Bin
 .../auth/multirole-example-author-insert.png  | Bin
 .../auth/multirole-example-author-select.png  | Bin
 .../auth/multirole-example-db-schema.png      | Bin
 .../auth/multirole-example-editor-select.png  | Bin
 .../auth/multirole-example-editor-update.png  | Bin
 .../multirole-example-reviewer-select.png     | Bin
 .../multirole-example-reviewer-update.png     | Bin
 ...e-example-reviewers-array-relationship.png | Bin
 .../{manual => core}/auth/multirole-setup.png | Bin
 ...nested-object-permission-reviewer-role.png | Bin
 ...ested-object-permission-simple-example.png | Bin
 .../auth/nested-object-permissions-rule.gif   | Bin
 .../auth/operators-for-integer-types.png      | Bin
 .../auth/operators-for-text-types.png         | Bin
 .../auth/org-manager-graphiql.png             | Bin
 ...ssion-basics-query-with-access-control.png | Bin
 .../auth/permission-basics-simple-example.png | Bin
 .../auth/permission-rule-granularity.png      | Bin
 .../auth/permissions-rule-analogy.png         | Bin
 .../auth/query-with-perms.png                 | Bin
 .../auth/restrict-columns.png                 | Bin
 .../restricted-data-for-reviewer-role.png     | Bin
 .../restricted-data-for-role-reviewer.png     | Bin
 ...ma-for-nested-object-based-permissions.png | Bin
 ...ariables-in-permissions-simple-example.png | Bin
 .../auth/simple-boolean-expression.png        | Bin
 ...nsuccessful-mutation-for-role-reviewer.png | Bin
 .../auth/user-select-graphiql.png             | Bin
 .../{manual => core}/auth/webhook-auth.png    | Bin
 .../add-remote-schemas-interface.png          | Bin
 .../business-logic/custom-business-logic.png  | Bin
 .../graphql-schema-stitching.png              | Bin
 .../using-custom-resolvers-and-stitching.png  | Bin
 .../deployment/access-key-console.png         | Bin
 .../deploy-to-render-hasura-header.png        | Bin
 .../deploy-to-render-hasura-iac.png           | Bin
 .../deployment/heroku-database-url-access.png | Bin
 .../remove-heroku-postgres-addon.png          | Bin
 .../deployment/schema_permissions_summary.png | Bin
 .../deployment/secure-heroku.png              | Bin
 .../engine-internals/hdb_permission.jpg       | Bin
 .../engine-internals/hdb_relationship.jpg     | Bin
 .../engine-internals/hdb_table.jpg            | Bin
 .../event-triggers/advanced-cron.png          | Bin
 .../event-triggers/advanced-one-off.png       | Bin
 .../event-triggers/create-cron.png            | Bin
 ...create-event-trigger-advanced-settings.png | Bin
 .../event-triggers/create-event-trigger.png   | Bin
 .../event-triggers/data-triggers-arch.png     | Bin
 .../event-triggers/define-cron-trigger.png    | Bin
 .../event-triggers/define-one-off-event.png   | Bin
 .../event-triggers/one-off.png                | Bin
 .../event-triggers/pending-cron.png           | Bin
 .../event-triggers/pending-one-off.png        | Bin
 .../event-triggers/run-manual-trigger.png     | Bin
 .../event-triggers/select-manual-trigger.png  | Bin
 .../getting-started/GraphQLAPI.jpg            | Bin
 .../getting-started/InstallSuccess.jpg        | Bin
 .../getting-started/TableTracked.jpg          | Bin
 .../getting-started/TrackTable.jpg            | Bin
 .../getting-started/UntrackedTables.jpg       | Bin
 .../getting-started/console-local.png         | Bin
 .../getting-started/console.png               | Bin
 .../getting-started/create-event-trigger.png  | Bin
 .../getting-started/create-profile-table.png  | Bin
 .../hasura-graphql-console.png                | Bin
 .../getting-started/heroku-env.png            | Bin
 .../getting-started/profile-query.png         | Bin
 .../getting-started/running-hasura.png        | Bin
 .../getting-started/trigger-details.png       | Bin
 .../getting-started/trigger-events.png        | Bin
 .../guides/auth-guardian-additional-role.png  | Bin
 .../guides/auth-guardian-config-generator.png | Bin
 .../guides/auth-guardian-default-role.png     | Bin
 .../auth-guardian-generate-test-jwt.png       | Bin
 .../guides/auth-guardian-session-variable.png | Bin
 .../guides/auth-guardian-test-jwt.png         | Bin
 .../guides/auth-guardian-user-id.png          | Bin
 .../guides/cognito-app-client-settings.png    | Bin
 .../{manual => core}/guides/cognito-jwt.png   | Bin
 .../guides/cognito-lambda.png                 | Bin
 .../guides/cognito-launch-hosted-ui.png       | Bin
 .../{manual => core}/guides/cognito-login.png | Bin
 .../guides/cognito-redirect.png               | Bin
 .../guides/cognito-triggers-1.png             | Bin
 .../guides/cognito-triggers-2.png             | Bin
 .../guides/create-client-popup.png            | Bin
 .../guides/heroku-app-deployed.png            | Bin
 .../{manual => core}/guides/heroku-app.png    | Bin
 .../guides/soft-deletes-delete-perms.png      | Bin
 .../guides/soft-deletes-example-data.png      | Bin
 .../guides/soft-deletes-insert-perms.png      | Bin
 .../guides/soft-deletes-select-perms.png      | Bin
 .../guides/soft-deletes-update-perms.png      | Bin
 .../migrations/tracked-tables.png             | Bin
 .../queries/analyze-query.png                 | Bin
 .../queries/query-analysis-after-index.png    | Bin
 .../queries/query-analysis-before-index.png   | Bin
 .../query-execution-plan-after-index.png      | Bin
 .../queries/query-execution-plan.png          | Bin
 .../remote-joins/action-rel.png               | Bin
 .../{manual => core}/remote-joins/add.png     | Bin
 .../remote-joins/define-action-rel.png        | Bin
 .../{manual => core}/remote-joins/define.png  | Bin
 .../remote-schemas/remote-schema-arch.png     | Bin
 .../scheduled-trigger-arch.png                | Bin
 .../schema/add-1-1-relationship.png           | Bin
 .../schema/add-1-many-relationship.png        | Bin
 .../schema/add-default-value.png              | Bin
 .../schema/add-foreign-key.png                | Bin
 .../schema/column-preset-mutation-result.png  | Bin
 .../column-preset-schema-change-for-role.png  | Bin
 .../schema/column-presets-option.png          | Bin
 .../schema/column-presets-value-options.png   | Bin
 .../schema/computed-field-create.png          | Bin
 .../schema/create-sql-fn-table.png            | Bin
 .../schema/create-table-graphql.png           | Bin
 .../schema/create-trigger.png                 | Bin
 .../{manual => core}/schema/created-at.png    | Bin
 .../schema/custom-field-name-column.png       | Bin
 .../schema/custom-field-name-root-fields.png  | Bin
 .../diagram-actions-data-validation.png       | Bin
 .../schema/enum-create-ref-table.png          | Bin
 .../schema/enum-insert-ref-values.png         | Bin
 .../schema/enum-set-foreign-key.png           | Bin
 .../{manual => core}/schema/enum-set.png      | Bin
 .../schema/manual-relationship-btn.png        | Bin
 .../schema/manual-relationship-create.png     | Bin
 .../schema/modify-sql-fn-table.png            | Bin
 .../graphql/{manual => core}/schema/relay.png | Bin
 .../schema-stitching-v1-arch-diagram.png      | Bin
 .../{manual => core}/schema/updated-at.png    | Bin
 .../schema/validation-actions-def.png         | Bin
 .../validation-add-check-constraint.png       | Bin
 .../schema/validation-author-isactive.png     | Bin
 .../schema/validation-not-empty.png           | Bin
 .../troubleshooting/author_article.jpg        | Bin
 docs/index.rst                                |   4 +--
 497 files changed, 241 insertions(+), 235 deletions(-)
 rename docs/{ => graphql}/cloud/allow-lists.rst (87%)
 rename docs/{ => graphql}/cloud/api-limits.rst (92%)
 rename docs/{ => graphql}/cloud/api-reference.rst (100%)
 rename docs/{ => graphql}/cloud/getting-started/index.rst (83%)
 rename docs/{ => graphql}/cloud/glossary.rst (100%)
 rename docs/{ => graphql}/cloud/hasurapro-cli/index.rst (100%)
 rename docs/{ => graphql}/cloud/index.rst (100%)
 rename docs/{ => graphql}/cloud/metrics/errors.rst (84%)
 rename docs/{ => graphql}/cloud/metrics/index.rst (88%)
 rename docs/{ => graphql}/cloud/metrics/operations.rst (95%)
 rename docs/{ => graphql}/cloud/metrics/overview.rst (82%)
 rename docs/{ => graphql}/cloud/metrics/subscription-workers.rst (84%)
 rename docs/{ => graphql}/cloud/metrics/usage.rst (81%)
 rename docs/{ => graphql}/cloud/metrics/websockets.rst (83%)
 rename docs/{ => graphql}/cloud/projects/create.rst (88%)
 rename docs/{ => graphql}/cloud/projects/delete.rst (85%)
 rename docs/{ => graphql}/cloud/projects/index.rst (84%)
 rename docs/{ => graphql}/cloud/projects/manage-projects/domains.rst (82%)
 rename docs/{ => graphql}/cloud/projects/manage-projects/env-vars.rst (91%)
 rename docs/{ => graphql}/cloud/projects/manage-projects/general.rst (91%)
 rename docs/{ => graphql}/cloud/projects/manage-projects/index.rst (91%)
 rename docs/{ => graphql}/cloud/projects/manage-projects/team.rst (89%)
 rename docs/{ => graphql}/cloud/projects/secure.rst (89%)
 rename docs/{ => graphql}/cloud/read-replicas.rst (100%)
 rename docs/{ => graphql}/cloud/regression-tests.rst (89%)
 rename docs/{ => graphql}/cloud/response-caching.rst (100%)
 rename docs/{ => graphql}/cloud/tracing.rst (97%)
 rename docs/graphql/{manual => core}/actions/action-examples.rst.wip (90%)
 rename docs/graphql/{manual => core}/actions/action-handlers.rst (98%)
 rename docs/graphql/{manual => core}/actions/action-permissions.rst (94%)
 rename docs/graphql/{manual => core}/actions/async-actions.rst (100%)
 rename docs/graphql/{manual => core}/actions/codegen.rst (90%)
 rename docs/graphql/{manual => core}/actions/create.rst (98%)
 rename docs/graphql/{manual => core}/actions/debugging.rst (100%)
 rename docs/graphql/{manual => core}/actions/derive.rst (95%)
 rename docs/graphql/{manual => core}/actions/index.rst (98%)
 rename docs/graphql/{manual => core}/actions/reuse-types-actions.rst (97%)
 rename docs/graphql/{manual => core}/actions/types/index.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/config.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/explain.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/graphql-api/index.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/graphql-api/mutation.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/graphql-api/query.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/health.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/index.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/pgdump.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/pgtypes.csv (100%)
 rename docs/graphql/{manual => core}/api-reference/postgresql-types.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/actions.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/computed-field.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/custom-functions.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/custom-types.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/dataerrors.csv (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/event-triggers.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/index.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/manage-metadata.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/permission.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/query-collections.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/relationship.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/remote-relationships.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/remote-schemas.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/run-sql.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/scheduled-triggers.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/syntax-defs.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/schema-metadata-api/table-view.rst (100%)
 rename docs/graphql/{manual => core}/api-reference/version.rst (100%)
 rename docs/graphql/{manual => core}/auth/authentication/index.rst (93%)
 rename docs/graphql/{manual => core}/auth/authentication/jwt.rst (99%)
 rename docs/graphql/{manual => core}/auth/authentication/unauthenticated-access.rst (100%)
 rename docs/graphql/{manual => core}/auth/authentication/webhook.rst (99%)
 rename docs/graphql/{manual => core}/auth/authorization/basics.rst (93%)
 rename docs/graphql/{manual => core}/auth/authorization/common-roles-auth-examples.rst (93%)
 rename docs/graphql/{manual => core}/auth/authorization/index.rst (96%)
 rename docs/graphql/{manual => core}/auth/authorization/modeling-roles.rst.wip (98%)
 rename docs/graphql/{manual => core}/auth/authorization/permission-rules.rst (91%)
 rename docs/graphql/{manual => core}/auth/authorization/reference-permissions.rst.wip (92%)
 rename docs/graphql/{manual => core}/auth/authorization/role-multiple-rules.rst (93%)
 rename docs/graphql/{manual => core}/auth/authorization/roles-variables.rst (99%)
 rename docs/graphql/{manual => core}/auth/authorization/use-cases.rst.wip (89%)
 rename docs/graphql/{manual => core}/auth/config.rst.wip (100%)
 rename docs/graphql/{manual => core}/auth/index.rst (96%)
 rename docs/graphql/{manual => core}/business-logic/index.rst.wip (95%)
 rename docs/graphql/{manual => core}/deployment/allow-list.rst (100%)
 rename docs/graphql/{manual => core}/deployment/compression.rst (100%)
 rename docs/graphql/{manual => core}/deployment/custom-docker-images.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/azure-container-instances-postgres.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/digital-ocean-one-click.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/docker.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/google-kubernetes-engine-cloud-sql.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/heroku.rst (96%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/index.rst (96%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/kubernetes.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/nhost-one-click.rst (100%)
 rename docs/graphql/{manual => core}/deployment/deployment-guides/render-one-click.rst (92%)
 rename docs/graphql/{manual => core}/deployment/downgrading.rst (100%)
 rename docs/graphql/{manual => core}/deployment/enable-https.rst (100%)
 rename docs/graphql/{manual => core}/deployment/graphql-engine-flags/config-examples.rst (100%)
 rename docs/graphql/{manual => core}/deployment/graphql-engine-flags/index.rst (100%)
 rename docs/graphql/{manual => core}/deployment/graphql-engine-flags/reference.rst (100%)
 rename docs/graphql/{manual => core}/deployment/index.rst (100%)
 rename docs/graphql/{manual => core}/deployment/logging.rst (100%)
 rename docs/graphql/{manual => core}/deployment/postgres-requirements.rst (100%)
 rename docs/graphql/{manual => core}/deployment/production-checklist.rst (98%)
 rename docs/graphql/{manual => core}/deployment/securing-graphql-endpoint.rst (100%)
 rename docs/graphql/{manual => core}/deployment/updating-graphql-engine.rst (100%)
 rename docs/graphql/{manual => core}/event-triggers/clean-up.rst (100%)
 rename docs/graphql/{manual => core}/event-triggers/create-trigger.rst (94%)
 rename docs/graphql/{manual => core}/event-triggers/index.rst (93%)
 rename docs/graphql/{manual => core}/event-triggers/invoke-trigger-console.rst (87%)
 rename docs/graphql/{manual => core}/event-triggers/payload.rst (100%)
 rename docs/graphql/{manual => core}/event-triggers/samples.rst (100%)
 rename docs/graphql/{manual => core}/event-triggers/serverless.rst (100%)
 rename docs/graphql/{manual => core}/faq/index.rst.wip (100%)
 rename docs/graphql/{manual => core}/getting-started/docker-simple.rst (100%)
 rename docs/graphql/{manual => core}/getting-started/first-event-trigger.rst (88%)
 rename docs/graphql/{manual => core}/getting-started/first-graphql-query.rst (89%)
 rename docs/graphql/{manual => core}/getting-started/index.rst (94%)
 rename docs/graphql/{manual => core}/getting-started/using-existing-database.rst (100%)
 rename docs/graphql/{manual => core}/guides/auditing-tables.rst (100%)
 rename docs/graphql/{manual => core}/guides/code-editor-integrations/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/code-editor-integrations/visual-studio-code.rst (100%)
 rename docs/graphql/{manual => core}/guides/data-modelling/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/data-modelling/soft-deletes.rst (91%)
 rename docs/graphql/{manual => core}/guides/docker-networking.rst (100%)
 rename docs/graphql/{manual => core}/guides/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/integrations/apollo-subscriptions.rst (100%)
 rename docs/graphql/{manual => core}/guides/integrations/auth-guardian-jwt.rst (93%)
 rename docs/graphql/{manual => core}/guides/integrations/auth0-jwt.rst (98%)
 rename docs/graphql/{manual => core}/guides/integrations/aws-cognito.rst (93%)
 rename docs/graphql/{manual => core}/guides/integrations/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/monitoring/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/sample-apps/index.rst (100%)
 rename docs/graphql/{manual => core}/guides/telemetry.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/config-reference.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_actions.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_actions_codegen.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_actions_create.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_actions_use-codegen.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_completion.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_console.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_init.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_apply.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_clear.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_diff.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_export.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_inconsistency.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_inconsistency_drop.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_inconsistency_list.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_inconsistency_status.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_metadata_reload.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_migrate.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_migrate_apply.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_migrate_create.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_migrate_squash.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_migrate_status.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_plugins.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_plugins_install.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_plugins_list.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_plugins_uninstall.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_plugins_upgrade.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_scripts.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_scripts_update-project-v2.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_seeds.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_seeds_apply.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_seeds_create.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_update-cli.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/hasura_version.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/index.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/install-hasura-cli.rst (100%)
 rename docs/graphql/{manual => core}/hasura-cli/uninstall-hasura-cli.rst (100%)
 rename docs/graphql/{manual => core}/how-it-works/index.rst (100%)
 rename docs/graphql/{manual => core}/how-it-works/metadata-schema.rst (98%)
 rename docs/graphql/{manual => core}/index.rst (100%)
 rename docs/graphql/{manual => core}/integration/index.rst.wip (100%)
 rename docs/graphql/{manual => core}/introduction/index.rst.wip (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/auto-apply-migrations.rst (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/collaboration.rst.wip (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/rolling-back-migrations.rst (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/seed-data-migration.rst (100%)
 rename docs/graphql/{manual => core}/migrations/advanced/writing-migrations-manually.rst (100%)
 rename docs/graphql/{manual => core}/migrations/basics.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/advanced/auto-apply-migrations.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/advanced/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/advanced/rolling-back-migrations.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/advanced/writing-migrations-manually.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/manage-metadata.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/manage-migrations.rst (99%)
 rename docs/graphql/{manual => core}/migrations/config-v1/reference/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/reference/metadata-file-format.rst (100%)
 rename docs/graphql/{manual => core}/migrations/config-v1/reference/migration-file-format.rst (100%)
 rename docs/graphql/{manual => core}/migrations/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/manage-metadata.rst (100%)
 rename docs/graphql/{manual => core}/migrations/migrations-setup.rst (99%)
 rename docs/graphql/{manual => core}/migrations/reference/how-it-works.rst (100%)
 rename docs/graphql/{manual => core}/migrations/reference/index.rst (100%)
 rename docs/graphql/{manual => core}/migrations/reference/metadata-format.rst (100%)
 rename docs/graphql/{manual => core}/migrations/reference/migration-file-format.rst (100%)
 rename docs/graphql/{manual => core}/migrations/upgrade-v2.rst (100%)
 rename docs/graphql/{manual => core}/mutations/delete.rst (100%)
 rename docs/graphql/{manual => core}/mutations/index.rst (100%)
 rename docs/graphql/{manual => core}/mutations/insert.rst (100%)
 rename docs/graphql/{manual => core}/mutations/multiple-mutations.rst (100%)
 rename docs/graphql/{manual => core}/mutations/update.rst (100%)
 rename docs/graphql/{manual => core}/mutations/upsert.rst (100%)
 rename docs/graphql/{manual => core}/performance/index.rst.wip (100%)
 rename docs/graphql/{manual => core}/queries/aggregation-queries.rst (100%)
 rename docs/graphql/{manual => core}/queries/distinct-queries.rst (100%)
 rename docs/graphql/{manual => core}/queries/index.rst (100%)
 rename docs/graphql/{manual => core}/queries/multiple-arguments.rst (100%)
 rename docs/graphql/{manual => core}/queries/multiple-queries.rst (100%)
 rename docs/graphql/{manual => core}/queries/nested-object-queries.rst (100%)
 rename docs/graphql/{manual => core}/queries/pagination.rst (100%)
 rename docs/graphql/{manual => core}/queries/performance.rst (97%)
 rename docs/graphql/{manual => core}/queries/query-filters.rst (100%)
 rename docs/graphql/{manual => core}/queries/simple-object-queries.rst (100%)
 rename docs/graphql/{manual => core}/queries/sorting.rst (100%)
 rename docs/graphql/{manual => core}/queries/variables-aliases-fragments-directives.rst (100%)
 rename docs/graphql/{manual => core}/remote-schemas/adding-schema.rst (98%)
 rename docs/graphql/{manual => core}/remote-schemas/index.rst (96%)
 rename docs/graphql/{manual => core}/remote-schemas/schema-auth.rst (100%)
 rename docs/graphql/{manual => core}/scheduled-triggers/create-cron-trigger.rst (94%)
 rename docs/graphql/{manual => core}/scheduled-triggers/create-one-off-scheduled-event.rst (92%)
 rename docs/graphql/{manual => core}/scheduled-triggers/index.rst (91%)
 rename docs/graphql/{manual => core}/schema/basics.rst (98%)
 rename docs/graphql/{manual => core}/schema/computed-fields.rst (99%)
 rename docs/graphql/{manual => core}/schema/custom-field-names.rst (91%)
 rename docs/graphql/{manual => core}/schema/custom-functions.rst (100%)
 rename docs/graphql/{manual => core}/schema/data-validations.rst (96%)
 rename docs/graphql/{manual => core}/schema/default-values/column-presets.rst (91%)
 rename docs/graphql/{manual => core}/schema/default-values/created-updated-timestamps.rst (97%)
 rename docs/graphql/{manual => core}/schema/default-values/index.rst (100%)
 rename docs/graphql/{manual => core}/schema/default-values/postgres-defaults.rst (97%)
 rename docs/graphql/{manual => core}/schema/default-values/sql-functions.rst (96%)
 rename docs/graphql/{manual => core}/schema/derived-data.rst.wip (100%)
 rename docs/graphql/{manual => core}/schema/enums.rst (99%)
 rename docs/graphql/{manual => core}/schema/export-graphql-schema.rst (100%)
 rename docs/graphql/{manual => core}/schema/import-database.rst.wip (100%)
 rename docs/graphql/{manual => core}/schema/index.rst (100%)
 rename docs/graphql/{manual => core}/schema/relay-schema.rst (98%)
 rename docs/graphql/{manual => core}/schema/remote-relationships/action-relationships.rst (97%)
 rename docs/graphql/{manual => core}/schema/remote-relationships/index.rst (100%)
 rename docs/graphql/{manual => core}/schema/remote-relationships/remote-schema-relationships.rst (97%)
 rename docs/graphql/{manual => core}/schema/table-relationships/create.rst (94%)
 rename docs/graphql/{manual => core}/schema/table-relationships/database-modelling/index.rst (100%)
 rename docs/graphql/{manual => core}/schema/table-relationships/database-modelling/many-to-many.rst (100%)
 rename docs/graphql/{manual => core}/schema/table-relationships/database-modelling/one-to-many.rst (100%)
 rename docs/graphql/{manual => core}/schema/table-relationships/database-modelling/one-to-one.rst (100%)
 rename docs/graphql/{manual => core}/schema/table-relationships/index.rst (100%)
 rename docs/graphql/{manual => core}/schema/table-relationships/rename.rst (100%)
 rename docs/graphql/{manual => core}/schema/using-existing-database.rst (100%)
 rename docs/graphql/{manual => core}/schema/views.rst (100%)
 rename docs/graphql/{manual => core}/security-disclosure/index.rst (100%)
 rename docs/graphql/{manual => core}/subscriptions/index.rst (100%)
 rename docs/graphql/{manual => core}/subscriptions/use-cases.rst (100%)
 rename docs/graphql/{manual => core}/troubleshooting/index.rst (100%)
 rename docs/graphql/{manual => core}/version-control/index.rst.wip (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/connect-db.png (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/connect-existing-db.png (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/create-project-existing-db.png (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/create-project-new-db.png (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/project-actions.png (100%)
 rename docs/img/{ => graphql}/cloud/getting-started/project-functionalities.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/inspect-error.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-errors.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-operations-inspect.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-operations.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-overview.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-subscription-workers.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-usage.png (100%)
 rename docs/img/{ => graphql}/cloud/metrics/pro-tab-websockets.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/add-collaborator.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/add-custom-domain.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/add-env-var.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/choose-custom-domain.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/cloud-create-project.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/cloud-project-invitation.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/cloud-projects-dashboard.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/create-new-project.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/create-project-heroku.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/dns-settings.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/dns-validated.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/dns-validation-pending.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/existing-db-setup.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/gcp-postgres-authorized-network.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/hasura-cloud-ip.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/manage-project.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/new-project-hosted.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/new-project-self-hosted.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/project-details.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/projects-delete.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/projects-list.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/secure-add-envvar.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/secure-envvars.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/secure-settings.png (100%)
 rename docs/img/{ => graphql}/cloud/projects/team-view.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-testing-diagram.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-add-operations.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-past-runs.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-results.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-run-cli.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-run-tests.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regression-tests-suites.png (100%)
 rename docs/img/{ => graphql}/cloud/reliability/regressions-run-prod-tests-on-dev.png (100%)
 rename docs/img/{ => graphql}/cloud/security/allowlist-add-new-op.png (100%)
 rename docs/img/{ => graphql}/cloud/security/pro-tab-apilimit-config.png (100%)
 rename docs/img/{ => graphql}/cloud/security/pro-tab-apilimits.png (100%)
 rename docs/img/{ => graphql}/cloud/security/pro-tabs-allowlist.png (100%)
 rename docs/img/{ => graphql}/cloud/tracing/tracing-operations-timing.png (100%)
 rename docs/img/graphql/{manual => core}/actions/action-array-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/actions/action-object-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/actions/action-secret-header.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-arch.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-derive-button.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-derive-codegen.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-derive-types.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/actions/actions-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/actions/cli-framework-prompt.png (100%)
 rename docs/img/graphql/{manual => core}/actions/cli-output-dir-prompt.png (100%)
 rename docs/img/graphql/{manual => core}/actions/cli-starter-kit-prompt.png (100%)
 rename docs/img/graphql/{manual => core}/actions/console-codegen-tab.png (100%)
 rename docs/img/graphql/{manual => core}/actions/mutation-action-create.png (100%)
 rename docs/img/graphql/{manual => core}/actions/query-action-create.png (100%)
 rename docs/img/graphql/{manual => core}/actions/update-address-action-definition.png (100%)
 rename docs/img/graphql/{manual => core}/actions/update-author-action-definition.png (100%)
 rename docs/img/graphql/{manual => core}/auth/aggregation-query-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/anonymous-role-examples.png (100%)
 rename docs/img/graphql/{manual => core}/auth/array-relationship-reviewers.png (100%)
 rename docs/img/graphql/{manual => core}/auth/auth-high-level-overview.png (100%)
 rename docs/img/graphql/{manual => core}/auth/auth-jwt-overview.png (100%)
 rename docs/img/graphql/{manual => core}/auth/auth-webhook-overview.png (100%)
 rename docs/img/graphql/{manual => core}/auth/author-insert-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/author-select-perms.png (100%)
 rename docs/img/graphql/{manual => core}/auth/author-table.png (100%)
 rename docs/img/graphql/{manual => core}/auth/boolean-operators.png (100%)
 rename docs/img/graphql/{manual => core}/auth/collaborator-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/auth/column-level-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/composite-boolean-expression.png (100%)
 rename docs/img/graphql/{manual => core}/auth/dev-mode-auth.png (100%)
 rename docs/img/graphql/{manual => core}/auth/dev-mode-role-header-access-key.png (100%)
 rename docs/img/graphql/{manual => core}/auth/dev-mode-role-header.png (100%)
 rename docs/img/graphql/{manual => core}/auth/exists-permission-example.png (100%)
 rename docs/img/graphql/{manual => core}/auth/fetch-authors.png (100%)
 rename docs/img/graphql/{manual => core}/auth/github-org-hierarchical-roles.png (100%)
 rename docs/img/graphql/{manual => core}/auth/hasura-perms.png (100%)
 rename docs/img/graphql/{manual => core}/auth/jwt-auth.png (100%)
 rename docs/img/graphql/{manual => core}/auth/jwt-config-generated.png (100%)
 rename docs/img/graphql/{manual => core}/auth/limit-results.png (100%)
 rename docs/img/graphql/{manual => core}/auth/limit-rows-for-select.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multiple-rules-create-manual-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multiple-rules-define-private-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multiple-rules-define-public-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-author-insert.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-author-select.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-db-schema.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-editor-select.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-editor-update.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-reviewer-select.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-reviewer-update.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-example-reviewers-array-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/auth/multirole-setup.png (100%)
 rename docs/img/graphql/{manual => core}/auth/nested-object-permission-reviewer-role.png (100%)
 rename docs/img/graphql/{manual => core}/auth/nested-object-permission-simple-example.png (100%)
 rename docs/img/graphql/{manual => core}/auth/nested-object-permissions-rule.gif (100%)
 rename docs/img/graphql/{manual => core}/auth/operators-for-integer-types.png (100%)
 rename docs/img/graphql/{manual => core}/auth/operators-for-text-types.png (100%)
 rename docs/img/graphql/{manual => core}/auth/org-manager-graphiql.png (100%)
 rename docs/img/graphql/{manual => core}/auth/permission-basics-query-with-access-control.png (100%)
 rename docs/img/graphql/{manual => core}/auth/permission-basics-simple-example.png (100%)
 rename docs/img/graphql/{manual => core}/auth/permission-rule-granularity.png (100%)
 rename docs/img/graphql/{manual => core}/auth/permissions-rule-analogy.png (100%)
 rename docs/img/graphql/{manual => core}/auth/query-with-perms.png (100%)
 rename docs/img/graphql/{manual => core}/auth/restrict-columns.png (100%)
 rename docs/img/graphql/{manual => core}/auth/restricted-data-for-reviewer-role.png (100%)
 rename docs/img/graphql/{manual => core}/auth/restricted-data-for-role-reviewer.png (100%)
 rename docs/img/graphql/{manual => core}/auth/schema-for-nested-object-based-permissions.png (100%)
 rename docs/img/graphql/{manual => core}/auth/session-variables-in-permissions-simple-example.png (100%)
 rename docs/img/graphql/{manual => core}/auth/simple-boolean-expression.png (100%)
 rename docs/img/graphql/{manual => core}/auth/unsuccessful-mutation-for-role-reviewer.png (100%)
 rename docs/img/graphql/{manual => core}/auth/user-select-graphiql.png (100%)
 rename docs/img/graphql/{manual => core}/auth/webhook-auth.png (100%)
 rename docs/img/graphql/{manual => core}/business-logic/add-remote-schemas-interface.png (100%)
 rename docs/img/graphql/{manual => core}/business-logic/custom-business-logic.png (100%)
 rename docs/img/graphql/{manual => core}/business-logic/graphql-schema-stitching.png (100%)
 rename docs/img/graphql/{manual => core}/business-logic/using-custom-resolvers-and-stitching.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/access-key-console.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/deploy-to-render-hasura-header.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/deploy-to-render-hasura-iac.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/heroku-database-url-access.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/remove-heroku-postgres-addon.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/schema_permissions_summary.png (100%)
 rename docs/img/graphql/{manual => core}/deployment/secure-heroku.png (100%)
 rename docs/img/graphql/{manual => core}/engine-internals/hdb_permission.jpg (100%)
 rename docs/img/graphql/{manual => core}/engine-internals/hdb_relationship.jpg (100%)
 rename docs/img/graphql/{manual => core}/engine-internals/hdb_table.jpg (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/advanced-cron.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/advanced-one-off.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/create-cron.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/create-event-trigger-advanced-settings.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/create-event-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/data-triggers-arch.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/define-cron-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/define-one-off-event.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/one-off.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/pending-cron.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/pending-one-off.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/run-manual-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/event-triggers/select-manual-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/GraphQLAPI.jpg (100%)
 rename docs/img/graphql/{manual => core}/getting-started/InstallSuccess.jpg (100%)
 rename docs/img/graphql/{manual => core}/getting-started/TableTracked.jpg (100%)
 rename docs/img/graphql/{manual => core}/getting-started/TrackTable.jpg (100%)
 rename docs/img/graphql/{manual => core}/getting-started/UntrackedTables.jpg (100%)
 rename docs/img/graphql/{manual => core}/getting-started/console-local.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/console.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/create-event-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/create-profile-table.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/hasura-graphql-console.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/heroku-env.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/profile-query.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/running-hasura.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/trigger-details.png (100%)
 rename docs/img/graphql/{manual => core}/getting-started/trigger-events.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-additional-role.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-config-generator.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-default-role.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-generate-test-jwt.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-session-variable.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-test-jwt.png (100%)
 rename docs/img/graphql/{manual => core}/guides/auth-guardian-user-id.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-app-client-settings.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-jwt.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-lambda.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-launch-hosted-ui.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-login.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-redirect.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-triggers-1.png (100%)
 rename docs/img/graphql/{manual => core}/guides/cognito-triggers-2.png (100%)
 rename docs/img/graphql/{manual => core}/guides/create-client-popup.png (100%)
 rename docs/img/graphql/{manual => core}/guides/heroku-app-deployed.png (100%)
 rename docs/img/graphql/{manual => core}/guides/heroku-app.png (100%)
 rename docs/img/graphql/{manual => core}/guides/soft-deletes-delete-perms.png (100%)
 rename docs/img/graphql/{manual => core}/guides/soft-deletes-example-data.png (100%)
 rename docs/img/graphql/{manual => core}/guides/soft-deletes-insert-perms.png (100%)
 rename docs/img/graphql/{manual => core}/guides/soft-deletes-select-perms.png (100%)
 rename docs/img/graphql/{manual => core}/guides/soft-deletes-update-perms.png (100%)
 rename docs/img/graphql/{manual => core}/migrations/tracked-tables.png (100%)
 rename docs/img/graphql/{manual => core}/queries/analyze-query.png (100%)
 rename docs/img/graphql/{manual => core}/queries/query-analysis-after-index.png (100%)
 rename docs/img/graphql/{manual => core}/queries/query-analysis-before-index.png (100%)
 rename docs/img/graphql/{manual => core}/queries/query-execution-plan-after-index.png (100%)
 rename docs/img/graphql/{manual => core}/queries/query-execution-plan.png (100%)
 rename docs/img/graphql/{manual => core}/remote-joins/action-rel.png (100%)
 rename docs/img/graphql/{manual => core}/remote-joins/add.png (100%)
 rename docs/img/graphql/{manual => core}/remote-joins/define-action-rel.png (100%)
 rename docs/img/graphql/{manual => core}/remote-joins/define.png (100%)
 rename docs/img/graphql/{manual => core}/remote-schemas/remote-schema-arch.png (100%)
 rename docs/img/graphql/{manual => core}/scheduled-triggers/scheduled-trigger-arch.png (100%)
 rename docs/img/graphql/{manual => core}/schema/add-1-1-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/schema/add-1-many-relationship.png (100%)
 rename docs/img/graphql/{manual => core}/schema/add-default-value.png (100%)
 rename docs/img/graphql/{manual => core}/schema/add-foreign-key.png (100%)
 rename docs/img/graphql/{manual => core}/schema/column-preset-mutation-result.png (100%)
 rename docs/img/graphql/{manual => core}/schema/column-preset-schema-change-for-role.png (100%)
 rename docs/img/graphql/{manual => core}/schema/column-presets-option.png (100%)
 rename docs/img/graphql/{manual => core}/schema/column-presets-value-options.png (100%)
 rename docs/img/graphql/{manual => core}/schema/computed-field-create.png (100%)
 rename docs/img/graphql/{manual => core}/schema/create-sql-fn-table.png (100%)
 rename docs/img/graphql/{manual => core}/schema/create-table-graphql.png (100%)
 rename docs/img/graphql/{manual => core}/schema/create-trigger.png (100%)
 rename docs/img/graphql/{manual => core}/schema/created-at.png (100%)
 rename docs/img/graphql/{manual => core}/schema/custom-field-name-column.png (100%)
 rename docs/img/graphql/{manual => core}/schema/custom-field-name-root-fields.png (100%)
 rename docs/img/graphql/{manual => core}/schema/diagram-actions-data-validation.png (100%)
 rename docs/img/graphql/{manual => core}/schema/enum-create-ref-table.png (100%)
 rename docs/img/graphql/{manual => core}/schema/enum-insert-ref-values.png (100%)
 rename docs/img/graphql/{manual => core}/schema/enum-set-foreign-key.png (100%)
 rename docs/img/graphql/{manual => core}/schema/enum-set.png (100%)
 rename docs/img/graphql/{manual => core}/schema/manual-relationship-btn.png (100%)
 rename docs/img/graphql/{manual => core}/schema/manual-relationship-create.png (100%)
 rename docs/img/graphql/{manual => core}/schema/modify-sql-fn-table.png (100%)
 rename docs/img/graphql/{manual => core}/schema/relay.png (100%)
 rename docs/img/graphql/{manual => core}/schema/schema-stitching-v1-arch-diagram.png (100%)
 rename docs/img/graphql/{manual => core}/schema/updated-at.png (100%)
 rename docs/img/graphql/{manual => core}/schema/validation-actions-def.png (100%)
 rename docs/img/graphql/{manual => core}/schema/validation-add-check-constraint.png (100%)
 rename docs/img/graphql/{manual => core}/schema/validation-author-isactive.png (100%)
 rename docs/img/graphql/{manual => core}/schema/validation-not-empty.png (100%)
 rename docs/img/graphql/{manual => core}/troubleshooting/author_article.jpg (100%)

diff --git a/docs/_static/scripts/hdocs.js b/docs/_static/scripts/hdocs.js
index 63ebf4343c05e..0b58f80ecdd02 100644
--- a/docs/_static/scripts/hdocs.js
+++ b/docs/_static/scripts/hdocs.js
@@ -14,8 +14,8 @@ window.hdocs = (function () {
 
       docsearch({
         appId: 'WCBB1VVLRC',
-        apiKey: '298d448cd9d7ed93fbab395658da19e8',
-        indexName: 'graphql-docs-prod',
+        apiKey: HDOCS_ALGOLIA_API_KEY,
+        indexName: HDOCS_ALGOLIA_INDEX,
         inputSelector: '#search_element',
         transformData: hdocs.transformSearchData,
         debug: false
diff --git a/docs/_theme/djangodocs/layout.html b/docs/_theme/djangodocs/layout.html
index 9735cec04928e..56b84a1785083 100644
--- a/docs/_theme/djangodocs/layout.html
+++ b/docs/_theme/djangodocs/layout.html
@@ -4,10 +4,14 @@
   {% set is_landing_page = true %}
 {%- endif %}
 
-{%- if 'graphql/manual' in pagename %}
+{%- if pagename.startswith('graphql/core') %}
   {% set is_core = true %}
-{%- elif 'cloud' in pagename %}
-  {% set is_cloud = true %} 
+  {% set ALGOLIA_INDEX = 'graphql-docs-prod' %}
+  {% set ALGOLIA_API_KEY = '298d448cd9d7ed93fbab395658da19e8' %}
+{%- elif pagename.startswith('graphql/cloud') %}
+  {% set is_cloud = true %}
+  {% set ALGOLIA_INDEX = 'cloud-docs-prod' %}
+  {% set ALGOLIA_API_KEY = 'cf84f05a225bedb72ce472dada63d29f' %}
 {%- endif %}
 
 {% set css_files = css_files + ['_static/graphiql/graphiql.css', '_static/styles/main.css'] %}
@@ -111,7 +115,7 @@
                   </a>
                 </li>
                 <li>
-                  <a href='https://hasura.io/docs/1.0/graphql/manual/getting-started/index.html'>
+                  <a href='https://hasura.io/docs/1.0/graphql/core/getting-started/index.html'>
                     <button class="commonBtn navBtnHome">
                       Get Started
                     </button>
@@ -168,7 +172,7 @@
                     </a>
                   </li>
                   <li>
-                    <a class="menuLink" href='https://hasura.io/docs/1.0/graphql/manual/getting-started/index.html'>
+                    <a class="menuLink" href='https://hasura.io/docs/1.0/graphql/core/getting-started/index.html'>
                       <button class='commonBtn navBtnHome'>
                         Get Started
                       </button>
@@ -193,12 +197,12 @@
                 <img src="{{ pathto('_images/layout/close-icon.svg', 1) }}" alt="Close"/>
               </div>
               <div class="tabbarContainerWrapper blueBgColor boderBottom">
-                <a href="{{ pathto('graphql/manual/index.html', 1) }}" {%- if is_core %} class="tabbarTabActive" {%- endif %}>
+                <a href="{{ pathto('graphql/core/index.html', 1) }}" {%- if is_core %} class="tabbarTabActive" {%- endif %}>
                   <span>
                     Hasura Core
                   </span>
                 </a>
-                <a href="{{ pathto('cloud/index.html', 1) }}" {%- if is_cloud %} class="tabbarTabActive" {%- endif %}>
+                <a href="{{ pathto('graphql/cloud/index.html', 1) }}" {%- if is_cloud %} class="tabbarTabActive" {%- endif %}>
                   <span>
                     Hasura Cloud
                   </span>
@@ -350,6 +354,8 @@
   <script type="text/javascript">
     const HDOCS_BASE_DOMAIN = "{{ BASE_DOMAIN }}";
     const HDOCS_GRAPHIQL_DEFAULT_ENDPOINT = "{{ GRAPHIQL_DEFAULT_ENDPOINT }}";
+    const HDOCS_ALGOLIA_INDEX = "{{ALGOLIA_INDEX}}";
+    const HDOCS_ALGOLIA_API_KEY = "{{ALGOLIA_API_KEY}}";
 
     document.addEventListener('DOMContentLoaded', function () {
       hdocs && hdocs.setup();
diff --git a/docs/_theme/djangodocs/pages/landing.html b/docs/_theme/djangodocs/pages/landing.html
index 9eba76e838148..d31d0fceab546 100644
--- a/docs/_theme/djangodocs/pages/landing.html
+++ b/docs/_theme/djangodocs/pages/landing.html
@@ -12,12 +12,12 @@ <h3 class="head_wrapper">Hasura docs</h3>
           <p class="description">This guide covers all Hasura concepts and features.</p>
           <ul>
             <li>
-              <a class="docs_link" href="{{ pathto('graphql/manual/index.html', 1) }}">
+              <a class="docs_link" href="{{ pathto('graphql/core/index.html', 1) }}">
                 Core docs
               </a>
             </li>
             <li>
-              <a class="docs_link" href="{{ pathto('cloud/index.html', 1) }}">
+              <a class="docs_link" href="{{ pathto('graphql/cloud/index.html', 1) }}">
                 Cloud docs
               </a>
             </li>
diff --git a/docs/cloud/allow-lists.rst b/docs/graphql/cloud/allow-lists.rst
similarity index 87%
rename from docs/cloud/allow-lists.rst
rename to docs/graphql/cloud/allow-lists.rst
index 02b05da11a189..9ffb1809b0fba 100644
--- a/docs/cloud/allow-lists.rst
+++ b/docs/graphql/cloud/allow-lists.rst
@@ -22,7 +22,7 @@ Manage the allow list
 
 The manager view offers inspection, export, or removal of operations in the allow list:
 
-.. thumbnail:: /img/cloud/security/pro-tabs-allowlist.png
+.. thumbnail:: /img/graphql/cloud/security/pro-tabs-allowlist.png
    :alt: Hasura Cloud Console allow list tab
 
 Quick-create allowed operations
@@ -30,5 +30,5 @@ Quick-create allowed operations
 
 This Pro feature lets you add to the allow list with one click from the record of past operations. (With Core, allow lists must be :ref:`managed manually <allow_list>`.)
 
-.. thumbnail:: /img/cloud/security/allowlist-add-new-op.png
+.. thumbnail:: /img/graphql/cloud/security/allowlist-add-new-op.png
    :alt: Hasura Cloud Console create new allowed operation
\ No newline at end of file
diff --git a/docs/cloud/api-limits.rst b/docs/graphql/cloud/api-limits.rst
similarity index 92%
rename from docs/cloud/api-limits.rst
rename to docs/graphql/cloud/api-limits.rst
index e3688aef56855..0269769629986 100644
--- a/docs/cloud/api-limits.rst
+++ b/docs/graphql/cloud/api-limits.rst
@@ -33,7 +33,7 @@ Manage API limits
 
 API limits can have a *global* or *per role* configuration. If an incoming request does not contain a valid role then the global limit is applied.
 
-.. thumbnail:: /img/cloud/security/pro-tab-apilimits.png
+.. thumbnail:: /img/graphql/cloud/security/pro-tab-apilimits.png
    :alt: Hasura Cloud Console api limit tab
 
 .. admonition:: Admin & IntrospectionQuery exemptions
@@ -45,5 +45,5 @@ Quick-create limits
 
 Hasura Cloud lets you add limits with one click from the list of past operations.
 
-.. thumbnail:: /img/cloud/security/pro-tab-apilimit-config.png
+.. thumbnail:: /img/graphql/cloud/security/pro-tab-apilimit-config.png
    :alt: Hasura Cloud Console create new api limit
\ No newline at end of file
diff --git a/docs/cloud/api-reference.rst b/docs/graphql/cloud/api-reference.rst
similarity index 100%
rename from docs/cloud/api-reference.rst
rename to docs/graphql/cloud/api-reference.rst
diff --git a/docs/cloud/getting-started/index.rst b/docs/graphql/cloud/getting-started/index.rst
similarity index 83%
rename from docs/cloud/getting-started/index.rst
rename to docs/graphql/cloud/getting-started/index.rst
index b847e5a9c3b50..9af090b5a8c03 100644
--- a/docs/cloud/getting-started/index.rst
+++ b/docs/graphql/cloud/getting-started/index.rst
@@ -26,7 +26,7 @@ Step 2: Connect new/existing database
 - To use an existing database, choose ``I have an existing Postgres database``.
 - To create a new database, choose ``Try a free database with Heroku``.
 
-.. thumbnail:: /img/cloud/getting-started/connect-db.png
+.. thumbnail:: /img/graphql/cloud/getting-started/connect-db.png
    :alt: Connect new or existing database
    :width: 591px
 
@@ -35,7 +35,7 @@ Step 2a: Enter database URL (for existing database)
 
 If you chose ``I have an existing Postgres database`` in :ref:`Step 2 <cloud_connect_db>`, enter a database URL.
 
-.. thumbnail:: /img/cloud/getting-started/connect-existing-db.png
+.. thumbnail:: /img/graphql/cloud/getting-started/connect-existing-db.png
    :alt: Enter URL for existing database
    :width: 556px
 
@@ -44,13 +44,13 @@ Step 3: Create project
 
 Click ``Create Project``.
 
-.. thumbnail:: /img/cloud/getting-started/create-project-new-db.png
+.. thumbnail:: /img/graphql/cloud/getting-started/create-project-new-db.png
    :alt: Create project for new database
    :width: 539px
    :group: create
    :class: inline-block
 
-.. thumbnail:: /img/cloud/getting-started/create-project-existing-db.png
+.. thumbnail:: /img/graphql/cloud/getting-started/create-project-existing-db.png
    :alt: Create project for existing database
    :width: 552px
    :group: create
@@ -66,7 +66,7 @@ Once you've created your project, you can get started with building with Hasura
   :depth: 1
   :local:
 
-.. thumbnail:: /img/cloud/getting-started/project-functionalities.png
+.. thumbnail:: /img/graphql/cloud/getting-started/project-functionalities.png
   :alt: Project actions
   :width: 860px
 
@@ -78,7 +78,7 @@ Click ``Launch Console`` to open the Hasura console in your browser and :ref:`ma
 
 You can navigate to the ``Pro`` tab to check out the Pro features that Hasura Cloud has set up for you.
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-overview.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-overview.png
    :alt: Hasura Console: Pro tab
    :width: 1118px
 
diff --git a/docs/cloud/glossary.rst b/docs/graphql/cloud/glossary.rst
similarity index 100%
rename from docs/cloud/glossary.rst
rename to docs/graphql/cloud/glossary.rst
diff --git a/docs/cloud/hasurapro-cli/index.rst b/docs/graphql/cloud/hasurapro-cli/index.rst
similarity index 100%
rename from docs/cloud/hasurapro-cli/index.rst
rename to docs/graphql/cloud/hasurapro-cli/index.rst
diff --git a/docs/cloud/index.rst b/docs/graphql/cloud/index.rst
similarity index 100%
rename from docs/cloud/index.rst
rename to docs/graphql/cloud/index.rst
diff --git a/docs/cloud/metrics/errors.rst b/docs/graphql/cloud/metrics/errors.rst
similarity index 84%
rename from docs/cloud/metrics/errors.rst
rename to docs/graphql/cloud/metrics/errors.rst
index 1ceb3cc0cb5b9..a1a32d69324e1 100644
--- a/docs/cloud/metrics/errors.rst
+++ b/docs/graphql/cloud/metrics/errors.rst
@@ -14,10 +14,10 @@ Errors
 
 Troubleshoot errors quickly with powerful analytical tools and filters:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-errors.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-errors.png
    :alt: Hasura Cloud Console errors tab
 
 Drill into a specific operation via the magnifying-glass icon next to the operation summary in the 'Frequent errors' table. You'll be taken to a list of the failed operations, and can choose one to inspect the specific operation content, metadata, and error generated:
 
-.. thumbnail:: /img/cloud/metrics/inspect-error.png
+.. thumbnail:: /img/graphql/cloud/metrics/inspect-error.png
    :alt: Hasura Cloud Console inspect a failed operation
diff --git a/docs/cloud/metrics/index.rst b/docs/graphql/cloud/metrics/index.rst
similarity index 88%
rename from docs/cloud/metrics/index.rst
rename to docs/graphql/cloud/metrics/index.rst
index 579a63e5da0d5..32e6053cc7f16 100644
--- a/docs/cloud/metrics/index.rst
+++ b/docs/graphql/cloud/metrics/index.rst
@@ -17,7 +17,7 @@ Introduction
 
 Hasura Cloud projects include Pro features for enhanced reliability and performance
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-overview.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-overview.png
    :alt: Hasura Cloud Console overview tab
 
 Learn more
diff --git a/docs/cloud/metrics/operations.rst b/docs/graphql/cloud/metrics/operations.rst
similarity index 95%
rename from docs/cloud/metrics/operations.rst
rename to docs/graphql/cloud/metrics/operations.rst
index 527acadaecb9f..157595af27af9 100644
--- a/docs/cloud/metrics/operations.rst
+++ b/docs/graphql/cloud/metrics/operations.rst
@@ -53,10 +53,10 @@ Operations
 
 Processed realtime logs of all requests to the GraphQL Engine. View all and inspect individual operations:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-operations.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-operations.png
    :alt: Hasura Cloud Console list operations
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-operations-inspect.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-operations-inspect.png
    :alt: Hasura Cloud Console inspect operation
 
 Filtering operations
diff --git a/docs/cloud/metrics/overview.rst b/docs/graphql/cloud/metrics/overview.rst
similarity index 82%
rename from docs/cloud/metrics/overview.rst
rename to docs/graphql/cloud/metrics/overview.rst
index ef343cbdb3667..8613e66b0fc79 100644
--- a/docs/cloud/metrics/overview.rst
+++ b/docs/graphql/cloud/metrics/overview.rst
@@ -14,5 +14,5 @@ Overview
 
 The Overview displays aggregate stats over the last hour:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-overview.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-overview.png
    :alt: Hasura Cloud Console overview tab
\ No newline at end of file
diff --git a/docs/cloud/metrics/subscription-workers.rst b/docs/graphql/cloud/metrics/subscription-workers.rst
similarity index 84%
rename from docs/cloud/metrics/subscription-workers.rst
rename to docs/graphql/cloud/metrics/subscription-workers.rst
index be67eb8228503..249e60204d154 100644
--- a/docs/cloud/metrics/subscription-workers.rst
+++ b/docs/graphql/cloud/metrics/subscription-workers.rst
@@ -14,5 +14,5 @@ Subscription workers
 
 Subscription workers offers a subscription-worker-specific version of usage statistics:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-subscription-workers.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-subscription-workers.png
    :alt: Hasura Cloud Console subscription workers tab
\ No newline at end of file
diff --git a/docs/cloud/metrics/usage.rst b/docs/graphql/cloud/metrics/usage.rst
similarity index 81%
rename from docs/cloud/metrics/usage.rst
rename to docs/graphql/cloud/metrics/usage.rst
index 53945f650bc95..2ee8ae5ee2219 100644
--- a/docs/cloud/metrics/usage.rst
+++ b/docs/graphql/cloud/metrics/usage.rst
@@ -14,10 +14,10 @@ Usage
 
 Learn about usage with aggregate summaries and filtering tools:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-usage.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-usage.png
    :alt: Hasura Cloud Console usage tab
 
 Drill into an operation via its magnifying-glass icon in the 'Query List' table. You'll be taken to a list of similar operations, and can choose one to inspect for content, metadata, and error generated:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-operations-inspect.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-operations-inspect.png
    :alt: Hasura Cloud Console inspect an operation
\ No newline at end of file
diff --git a/docs/cloud/metrics/websockets.rst b/docs/graphql/cloud/metrics/websockets.rst
similarity index 83%
rename from docs/cloud/metrics/websockets.rst
rename to docs/graphql/cloud/metrics/websockets.rst
index 0312bdbd4adeb..2bcbc5f887fd9 100644
--- a/docs/cloud/metrics/websockets.rst
+++ b/docs/graphql/cloud/metrics/websockets.rst
@@ -14,5 +14,5 @@ Websockets
 
 Websockets is a ws-specific version of usage statistics:
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-websockets.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-websockets.png
    :alt: Hasura Cloud Console websockets tab
\ No newline at end of file
diff --git a/docs/cloud/projects/create.rst b/docs/graphql/cloud/projects/create.rst
similarity index 88%
rename from docs/cloud/projects/create.rst
rename to docs/graphql/cloud/projects/create.rst
index 0922108b6d6cc..ae5d785753266 100644
--- a/docs/cloud/projects/create.rst
+++ b/docs/graphql/cloud/projects/create.rst
@@ -19,7 +19,7 @@ You can create a new Hasura Cloud project with either a new Postgres database, o
 
 To begin, navigate to the ``Projects`` page, and click the ``New Project`` link.
 
-.. thumbnail:: /img/cloud/projects/create-new-project.png
+.. thumbnail:: /img/graphql/cloud/projects/create-new-project.png
    :alt: create new project button
    :width: 400
 
@@ -30,7 +30,7 @@ Hasura Cloud does not host databases, but does provide integrations with which y
 
 To get started, click ``Try with Heroku``, and follow the prompts to authenticate with Heroku. Hasura Cloud will integrate with your Heroku account and manage the initial setup of a dev-tier Postgres instance. You can always upgrade the instance and manage options later through your Heroku account.
 
-.. thumbnail:: /img/cloud/projects/create-project-heroku.png
+.. thumbnail:: /img/graphql/cloud/projects/create-project-heroku.png
    :alt: create new hosted project
 
 Creating a project with an existing database
@@ -38,7 +38,7 @@ Creating a project with an existing database
 
 To create a new Hasura Cloud project connected to an existing Postgres database, click ``Enter Database URL``, and enter your database connection string (looks like ``postgres://username:password@hostname:port/dbname``).
 
-.. thumbnail:: /img/cloud/projects/new-project-hosted.png
+.. thumbnail:: /img/graphql/cloud/projects/new-project-hosted.png
    :alt: create new hosted project
 
 Allowing connections from Hasura Cloud IP
@@ -46,15 +46,15 @@ Allowing connections from Hasura Cloud IP
 
 For some cloud services, like GCP, you'll need to adjust your Postgres connection settings to allow connections from the Hasura Cloud IP address. You can copy the IP address from either the copy icon in the ``Database Setup`` window, or the ``Hasura Cloud IP`` field on the project's details view. You may also need to disable SSL. Adding custom cert information to a Hasura Cloud instance is not yet available. 
 
-.. thumbnail:: /img/cloud/projects/existing-db-setup.png
+.. thumbnail:: /img/graphql/cloud/projects/existing-db-setup.png
    :alt: Existing database setup
    :width: 568px
 
-.. thumbnail:: /img/cloud/projects/hasura-cloud-ip.png
+.. thumbnail:: /img/graphql/cloud/projects/hasura-cloud-ip.png
    :alt: Hasura Cloud IP field
    :width: 1200px
 
-.. thumbnail:: /img/cloud/projects/gcp-postgres-authorized-network.png
+.. thumbnail:: /img/graphql/cloud/projects/gcp-postgres-authorized-network.png
    :alt: whitelist Hasura instance IP in Postgres settings
    :width: 727px
 
diff --git a/docs/cloud/projects/delete.rst b/docs/graphql/cloud/projects/delete.rst
similarity index 85%
rename from docs/cloud/projects/delete.rst
rename to docs/graphql/cloud/projects/delete.rst
index 04de15afa0357..b9ce6b56cbe17 100644
--- a/docs/cloud/projects/delete.rst
+++ b/docs/graphql/cloud/projects/delete.rst
@@ -14,6 +14,6 @@ Deleting projects
 
 You can delete a project with the ``Delete Project`` button at the bottom of the project's details view.
 
-.. thumbnail:: /img/cloud/projects/projects-delete.png
+.. thumbnail:: /img/graphql/cloud/projects/projects-delete.png
    :alt: delete a project
    :width: 1199px
\ No newline at end of file
diff --git a/docs/cloud/projects/index.rst b/docs/graphql/cloud/projects/index.rst
similarity index 84%
rename from docs/cloud/projects/index.rst
rename to docs/graphql/cloud/projects/index.rst
index d783047913c16..70174c9be313b 100644
--- a/docs/cloud/projects/index.rst
+++ b/docs/graphql/cloud/projects/index.rst
@@ -17,7 +17,7 @@ Introduction
 
 The ``Projects`` page show a list of your projects.
 
-.. thumbnail:: /img/cloud/projects/projects-list.png
+.. thumbnail:: /img/graphql/cloud/projects/projects-list.png
    :alt: Projects list
    :width: 1200px
 
@@ -26,11 +26,11 @@ For each project, you can:
 - Click the gear icon to :ref:`manage your project <manage_project>`, or
 - Click ``Launch Console`` to open the Hasura console in your browser, and navigate to the ``Pro`` tab to check out the Pro features that Hasura Cloud has set up for you.
 
-.. thumbnail:: /img/cloud/getting-started/project-actions.png
+.. thumbnail:: /img/graphql/cloud/getting-started/project-actions.png
    :alt: Project actions
    :width: 860px
 
-.. thumbnail:: /img/cloud/metrics/pro-tab-overview.png
+.. thumbnail:: /img/graphql/cloud/metrics/pro-tab-overview.png
    :alt: Hasura Console: Pro tab
    :width: 1118px
 
diff --git a/docs/cloud/projects/manage-projects/domains.rst b/docs/graphql/cloud/projects/manage-projects/domains.rst
similarity index 82%
rename from docs/cloud/projects/manage-projects/domains.rst
rename to docs/graphql/cloud/projects/manage-projects/domains.rst
index 4bdc5b6dab324..f1475e07408be 100644
--- a/docs/cloud/projects/manage-projects/domains.rst
+++ b/docs/graphql/cloud/projects/manage-projects/domains.rst
@@ -27,7 +27,7 @@ Step 1: Navigate to add a custom domain
 
 On the ``Domains`` tab, click on the ``New Custom Domain`` button.
 
-.. thumbnail:: /img/cloud/projects/add-custom-domain.png
+.. thumbnail:: /img/graphql/cloud/projects/add-custom-domain.png
    :alt: Add custom domain
    :width: 727px
 
@@ -36,7 +36,7 @@ Step 2: Add your custom domain
 
 Enter your custom domain and click the ``Add`` button.
 
-.. thumbnail:: /img/cloud/projects/choose-custom-domain.png
+.. thumbnail:: /img/graphql/cloud/projects/choose-custom-domain.png
    :alt: Choose custom domain
    :width: 727px
 
@@ -45,7 +45,7 @@ Step 3: Add the record to your DNS
 
 After adding a custom domain, the following window will show up:
 
-.. thumbnail:: /img/cloud/projects/dns-settings.png
+.. thumbnail:: /img/graphql/cloud/projects/dns-settings.png
    :alt: DNS settings
    :width: 727px
 
@@ -53,7 +53,7 @@ If you haven't already done so, add the default Hasura domain as a ``CNAME`` rec
 
 Until this is done, the dashboard will show a notice that the DNS validation is pending. 
 
-.. thumbnail:: /img/cloud/projects/dns-validation-pending.png
+.. thumbnail:: /img/graphql/cloud/projects/dns-validation-pending.png
    :alt: DNS validation pending
    :width: 727px
 
@@ -66,6 +66,6 @@ DNS validated
 
 Once the DNS is validated, the dashboard will update the status with the following notice:
 
-.. thumbnail:: /img/cloud/projects/dns-validated.png
+.. thumbnail:: /img/graphql/cloud/projects/dns-validated.png
    :alt: DNS validated
    :width: 727px
diff --git a/docs/cloud/projects/manage-projects/env-vars.rst b/docs/graphql/cloud/projects/manage-projects/env-vars.rst
similarity index 91%
rename from docs/cloud/projects/manage-projects/env-vars.rst
rename to docs/graphql/cloud/projects/manage-projects/env-vars.rst
index 3470346b14044..d4b4eed37a83c 100644
--- a/docs/cloud/projects/manage-projects/env-vars.rst
+++ b/docs/graphql/cloud/projects/manage-projects/env-vars.rst
@@ -22,6 +22,6 @@ Adding an env var
 
 Click on the ``New Env Var`` button and either choose an env var from the dropdown or add a custom env var.
 
-.. thumbnail:: /img/cloud/projects/add-env-var.png
+.. thumbnail:: /img/graphql/cloud/projects/add-env-var.png
    :alt: add env var options
    :width: 1200px
diff --git a/docs/cloud/projects/manage-projects/general.rst b/docs/graphql/cloud/projects/manage-projects/general.rst
similarity index 91%
rename from docs/cloud/projects/manage-projects/general.rst
rename to docs/graphql/cloud/projects/manage-projects/general.rst
index fde3c91528594..962700f33385f 100644
--- a/docs/cloud/projects/manage-projects/general.rst
+++ b/docs/graphql/cloud/projects/manage-projects/general.rst
@@ -26,6 +26,6 @@ General settings
 - **Admin Secret**: Secret for securing the GraphQL endpoint
 - **Owner**: Email of the project owner
 
-.. thumbnail:: /img/cloud/projects/project-details.png
+.. thumbnail:: /img/graphql/cloud/projects/project-details.png
    :alt: General tab
    :width: 1163px
diff --git a/docs/cloud/projects/manage-projects/index.rst b/docs/graphql/cloud/projects/manage-projects/index.rst
similarity index 91%
rename from docs/cloud/projects/manage-projects/index.rst
rename to docs/graphql/cloud/projects/manage-projects/index.rst
index b5d0fe28dd717..df778315b261f 100644
--- a/docs/cloud/projects/manage-projects/index.rst
+++ b/docs/graphql/cloud/projects/manage-projects/index.rst
@@ -17,7 +17,7 @@ Introduction
 
 To view a project's details, and manage its teams and environment variables, navigate to the ``Projects`` page and click the gear icon on the project.
 
-.. thumbnail:: /img/cloud/projects/manage-project.png
+.. thumbnail:: /img/graphql/cloud/projects/manage-project.png
    :alt: Manage project
    :width: 865px
 
diff --git a/docs/cloud/projects/manage-projects/team.rst b/docs/graphql/cloud/projects/manage-projects/team.rst
similarity index 89%
rename from docs/cloud/projects/manage-projects/team.rst
rename to docs/graphql/cloud/projects/manage-projects/team.rst
index a2072ecba99ca..43fd667f44025 100644
--- a/docs/cloud/projects/manage-projects/team.rst
+++ b/docs/graphql/cloud/projects/manage-projects/team.rst
@@ -22,7 +22,7 @@ Add a collaborator
 
 Click ``New Collaborator`` to invite a new team member.
 
-.. thumbnail:: /img/cloud/projects/team-view.png
+.. thumbnail:: /img/graphql/cloud/projects/team-view.png
    :alt: Team tab
    :width: 1146px
 
@@ -37,7 +37,7 @@ Team members can have different levels of access in the Hasura console.
   - The ``Execute GraphQL`` permission allows running queries, mutations, and subscriptions.
   - The ``View Metrics`` permission allows inspecting operation data and the performance dashboard.
 
-.. thumbnail:: /img/cloud/projects/add-collaborator.png
+.. thumbnail:: /img/graphql/cloud/projects/add-collaborator.png
    :alt: Add collaborator
    :width: 437px
 
diff --git a/docs/cloud/projects/secure.rst b/docs/graphql/cloud/projects/secure.rst
similarity index 89%
rename from docs/cloud/projects/secure.rst
rename to docs/graphql/cloud/projects/secure.rst
index 3f637a139d3d3..3c2ec82b33054 100644
--- a/docs/cloud/projects/secure.rst
+++ b/docs/graphql/cloud/projects/secure.rst
@@ -25,7 +25,7 @@ Step 1: Go to settings
 
 On the project overview, click on the settings icon on the top right of the relevant project.
 
-.. thumbnail:: /img/cloud/projects/secure-settings.png
+.. thumbnail:: /img/graphql/cloud/projects/secure-settings.png
    :alt: Go to settings
    :width: 865px
 
@@ -34,7 +34,7 @@ Step 2: Navigate to env vars
 
 On the ``Env vars`` tab, click the button to add a new env var.
 
-.. thumbnail:: /img/cloud/projects/secure-envvars.png
+.. thumbnail:: /img/graphql/cloud/projects/secure-envvars.png
    :alt: Navigate to env vars
    :width: 865px
 
@@ -43,7 +43,7 @@ Step 3: Add an admin secret
 
 In the ``Key`` dropdown, choose ``ADMIN_SECRET`` and add the secret in the ``Value`` field. Then click the ``Add`` button.
 
-.. thumbnail:: /img/cloud/projects/secure-add-envvar.png
+.. thumbnail:: /img/graphql/cloud/projects/secure-add-envvar.png
    :alt: Navigate to env vars
    :width: 865px
 
diff --git a/docs/cloud/read-replicas.rst b/docs/graphql/cloud/read-replicas.rst
similarity index 100%
rename from docs/cloud/read-replicas.rst
rename to docs/graphql/cloud/read-replicas.rst
diff --git a/docs/cloud/regression-tests.rst b/docs/graphql/cloud/regression-tests.rst
similarity index 89%
rename from docs/cloud/regression-tests.rst
rename to docs/graphql/cloud/regression-tests.rst
index 2e9a97a9f8824..f62e7af643e07 100644
--- a/docs/cloud/regression-tests.rst
+++ b/docs/graphql/cloud/regression-tests.rst
@@ -32,7 +32,7 @@ Here's a reference development workflow that is enabled by Hasura Cloud:
 
 #. Promote changes to prod
 
-.. thumbnail:: /img/cloud/reliability/regression-testing-diagram.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-testing-diagram.png
    :alt: Regression testing process diagram
 
 Manage test suites
@@ -40,7 +40,7 @@ Manage test suites
 
 Each Hasura Cloud project can be configured with a separate test suite. Ideally, you want to create a regression test suite on an project which has received requests with operations you’d like to continue supporting or ensure are not “broken” - production or a shared QA project which receives operations in your app or, if you have a public GraphQL API, those from your consumers.
 
-.. thumbnail:: /img/cloud/reliability/regression-tests-suites.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-tests-suites.png
    :alt: Manage regression test suites
 
 Quick-create tests
@@ -48,7 +48,7 @@ Quick-create tests
 
 Add important operations to your test suite with one click by adding them from your project's operation history:
 
-.. thumbnail:: /img/cloud/reliability/regression-tests-add-operations.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-tests-add-operations.png
    :alt: Add tests to regression test suites
 
 Run test suites
@@ -63,12 +63,12 @@ Run regression tests manually
 
 Let’s say you’re a developer iterating on a feature and, as part of your work, need to modify your Postgres schema or the Hasura configuration. It is likely that you are doing so by running the console via the Hasura CLI to generate migrations that you can version control. Before committing your changes in git, you should run tests to get an early warning for potential regressions. Your team may want to designate the test suite from your production instance (or a suitable alternative) as the default suite to be used for this, and you can choose to run this test suite on your local or development instance.
 
-.. thumbnail:: /img/cloud/reliability/regressions-run-prod-tests-on-dev.png
+.. thumbnail:: /img/graphql/cloud/reliability/regressions-run-prod-tests-on-dev.png
    :alt: Run regression tests
 
 For example, if the column ‘title’ (in a typical authors and articles schema) has been modified as part of a feature iteration. Assuming the operation from the previous example is part of the test suite on production, here’s how the feedback on this change looks like:
 
-.. thumbnail:: /img/cloud/reliability/regression-tests-results.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-tests-results.png
    :alt: Regression test results
 
 As you can see, one of the tests fails because it expects a field, title, to be part of the type articles - which is something our proposed change just modified and removed support for.
@@ -76,7 +76,7 @@ As you can see, one of the tests fails because it expects a field, title, to be
 Run regression tests in CI/CD flow
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. thumbnail:: /img/cloud/reliability/regression-tests-run-cli.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-tests-run-cli.png
    :alt: Run regression tests via CLI
 
 This command will fetch the entire test suite from Hasura Pro and run the tests against given endpoint using the admin secret and report the result on the terminal. The test run and the results will also be available on the Hasura Console.
@@ -93,5 +93,5 @@ In order to communicate with Hasura’s APIs, the CLI needs to be configured wit
 View test suite results
 -----------------------
 
-.. thumbnail:: /img/cloud/reliability/regression-tests-past-runs.png
+.. thumbnail:: /img/graphql/cloud/reliability/regression-tests-past-runs.png
    :alt: Regression tests past results
\ No newline at end of file
diff --git a/docs/cloud/response-caching.rst b/docs/graphql/cloud/response-caching.rst
similarity index 100%
rename from docs/cloud/response-caching.rst
rename to docs/graphql/cloud/response-caching.rst
diff --git a/docs/cloud/tracing.rst b/docs/graphql/cloud/tracing.rst
similarity index 97%
rename from docs/cloud/tracing.rst
rename to docs/graphql/cloud/tracing.rst
index eac714a9e35c9..8d9892abe00a5 100644
--- a/docs/cloud/tracing.rst
+++ b/docs/graphql/cloud/tracing.rst
@@ -30,7 +30,7 @@ The Hasura Pro console makes it possible to view Hasura's own tracing
 data, by opening the details view for an operation in the Operations
 tab:
 
-.. thumbnail:: /img/cloud/tracing/tracing-operations-timing.png
+.. thumbnail:: /img/graphql/cloud/tracing/tracing-operations-timing.png
    :alt: View timing data in the Operations tab
 
 Given that other system components will report their own tracing data to
diff --git a/docs/graphql/manual/actions/action-examples.rst.wip b/docs/graphql/core/actions/action-examples.rst.wip
similarity index 90%
rename from docs/graphql/manual/actions/action-examples.rst.wip
rename to docs/graphql/core/actions/action-examples.rst.wip
index ad3b48c45a29c..0785e93600217 100644
--- a/docs/graphql/manual/actions/action-examples.rst.wip
+++ b/docs/graphql/core/actions/action-examples.rst.wip
@@ -34,14 +34,14 @@ This page provides reference examples of typical action use cases.
 
   Now we have an action ``updateAddress`` that looks as follows:
 
-  .. thumbnail:: /img/graphql/manual/actions/update-address-action-definition.png
+  .. thumbnail:: /img/graphql/core/actions/update-address-action-definition.png
          :alt: Update address action
          :width: 65%
 
   We can now add an object relationship from the ``updateAddress`` action to the ``authors`` table in our schema.
   We call it ``updatedAddressAuthor``.
 
-  .. thumbnail:: /img/graphql/manual/actions/action-object-relationship.png
+  .. thumbnail:: /img/graphql/core/actions/action-object-relationship.png
          :alt: Object relationship from action
          :width: 65%
 
@@ -90,14 +90,14 @@ This page provides reference examples of typical action use cases.
 
   Now we have an action ``updateAuthor`` that looks as follows:
 
-  .. thumbnail:: /img/graphql/manual/actions/update-author-action-definition.png
+  .. thumbnail:: /img/graphql/core/actions/update-author-action-definition.png
          :alt: Update author action
          :width: 65%
 
   We can now add an array relationship from the ``updateAuthor`` action to the ``articles`` table in our schema.
   We call it ``updatedAuthorArticles``.
 
-  .. thumbnail:: /img/graphql/manual/actions/action-array-relationship.png
+  .. thumbnail:: /img/graphql/core/actions/action-array-relationship.png
          :alt: Array relationship from action
          :width: 65%
 
diff --git a/docs/graphql/manual/actions/action-handlers.rst b/docs/graphql/core/actions/action-handlers.rst
similarity index 98%
rename from docs/graphql/manual/actions/action-handlers.rst
rename to docs/graphql/core/actions/action-handlers.rst
index 58bf571b2d5f3..fceaaa4e049b3 100644
--- a/docs/graphql/manual/actions/action-handlers.rst
+++ b/docs/graphql/core/actions/action-handlers.rst
@@ -183,7 +183,7 @@ For your action, add a header that will act as an action secret.
      Head to the ``Actions -> [action-name]`` tab in the console and scroll down to ``Headers``.
      You can now configure an action secret by adding a header:
 
-     .. thumbnail:: /img/graphql/manual/actions/action-secret-header.png
+     .. thumbnail:: /img/graphql/core/actions/action-secret-header.png
         :alt: Console action secret
         :width: 75%
 
diff --git a/docs/graphql/manual/actions/action-permissions.rst b/docs/graphql/core/actions/action-permissions.rst
similarity index 94%
rename from docs/graphql/manual/actions/action-permissions.rst
rename to docs/graphql/core/actions/action-permissions.rst
index 61018099ec9ab..b426f80cae9ad 100644
--- a/docs/graphql/manual/actions/action-permissions.rst
+++ b/docs/graphql/core/actions/action-permissions.rst
@@ -29,7 +29,7 @@ Set action permissions
      Head to the ``Actions -> [action-name] -> Permissions`` tab in the
      console.
 
-     .. thumbnail:: /img/graphql/manual/actions/actions-permissions.png
+     .. thumbnail:: /img/graphql/core/actions/actions-permissions.png
         :alt: Console action permission
 
      Hit ``Save`` to give the role permission to access the action.
diff --git a/docs/graphql/manual/actions/async-actions.rst b/docs/graphql/core/actions/async-actions.rst
similarity index 100%
rename from docs/graphql/manual/actions/async-actions.rst
rename to docs/graphql/core/actions/async-actions.rst
diff --git a/docs/graphql/manual/actions/codegen.rst b/docs/graphql/core/actions/codegen.rst
similarity index 90%
rename from docs/graphql/manual/actions/codegen.rst
rename to docs/graphql/core/actions/codegen.rst
index 6f1b2647e7dee..d37bf975d4c32 100644
--- a/docs/graphql/manual/actions/codegen.rst
+++ b/docs/graphql/core/actions/codegen.rst
@@ -41,7 +41,7 @@ Generating handler code for your action
     You can select the framework of your choice to get the corresponding
     handler boilerplate code.
 
-    .. thumbnail:: /img/graphql/manual/actions/console-codegen-tab.png
+    .. thumbnail:: /img/graphql/core/actions/console-codegen-tab.png
        :alt: Console codegen tab
 
 
@@ -59,17 +59,17 @@ Generating handler code for your action
 
     1. Choose which framework you want to codegen for:
 
-       .. thumbnail:: /img/graphql/manual/actions/cli-framework-prompt.png
+       .. thumbnail:: /img/graphql/core/actions/cli-framework-prompt.png
           :alt: CLI Framework Prompt
 
     2. Choose if you also wish to clone a starter kit for the chosen framework:
 
-       .. thumbnail:: /img/graphql/manual/actions/cli-starter-kit-prompt.png
+       .. thumbnail:: /img/graphql/core/actions/cli-starter-kit-prompt.png
           :alt: CLI Starter Kit Prompt
 
     3. Choose a path where you want to output the auto-generated code files
 
-       .. thumbnail:: /img/graphql/manual/actions/cli-output-dir-prompt.png
+       .. thumbnail:: /img/graphql/core/actions/cli-output-dir-prompt.png
           :alt: CLI Starter Kit Prompt
 
 
diff --git a/docs/graphql/manual/actions/create.rst b/docs/graphql/core/actions/create.rst
similarity index 98%
rename from docs/graphql/manual/actions/create.rst
rename to docs/graphql/core/actions/create.rst
index a5682061b107e..5fce9c057242b 100644
--- a/docs/graphql/manual/actions/create.rst
+++ b/docs/graphql/core/actions/create.rst
@@ -96,7 +96,7 @@ in the GraphQL schema.
      Go to the ``Actions`` tab on the console and click on ``Create``. This will
      take you to a page like this:
 
-     .. thumbnail:: /img/graphql/manual/actions/mutation-action-create.png
+     .. thumbnail:: /img/graphql/core/actions/mutation-action-create.png
         :alt: Console action create
         :width: 70%
 
@@ -275,7 +275,7 @@ the GraphQL schema.
      Go to the ``Actions`` tab on the console and click on ``Create``. This will
      take you to a page like this:
 
-     .. thumbnail:: /img/graphql/manual/actions/query-action-create.png
+     .. thumbnail:: /img/graphql/core/actions/query-action-create.png
         :alt: Console action create
         :width: 70%
 
diff --git a/docs/graphql/manual/actions/debugging.rst b/docs/graphql/core/actions/debugging.rst
similarity index 100%
rename from docs/graphql/manual/actions/debugging.rst
rename to docs/graphql/core/actions/debugging.rst
diff --git a/docs/graphql/manual/actions/derive.rst b/docs/graphql/core/actions/derive.rst
similarity index 95%
rename from docs/graphql/manual/actions/derive.rst
rename to docs/graphql/core/actions/derive.rst
index 58426def828ba..22fd9d0d74bf7 100644
--- a/docs/graphql/manual/actions/derive.rst
+++ b/docs/graphql/core/actions/derive.rst
@@ -75,13 +75,13 @@ derive our action:
 
      Next hit the ``Derive action`` button as shown below:
 
-     .. thumbnail:: /img/graphql/manual/actions/actions-derive-button.png
+     .. thumbnail:: /img/graphql/core/actions/actions-derive-button.png
         :alt: Console derive action button
 
      This will redirect you to the ``Add a new action`` page with the action
      definition auto filled.
 
-     .. thumbnail:: /img/graphql/manual/actions/actions-derive-types.png
+     .. thumbnail:: /img/graphql/core/actions/actions-derive-types.png
         :alt: Console derived action types
 
 
@@ -149,7 +149,7 @@ the action back to the original operation.
     You can select the framework of your choice to get the corresponding
     handler boilerplate code.
 
-    .. thumbnail:: /img/graphql/manual/actions/actions-derive-codegen.png
+    .. thumbnail:: /img/graphql/core/actions/actions-derive-codegen.png
        :alt: Console derived action codegen
 
     .. note::
diff --git a/docs/graphql/manual/actions/index.rst b/docs/graphql/core/actions/index.rst
similarity index 98%
rename from docs/graphql/manual/actions/index.rst
rename to docs/graphql/core/actions/index.rst
index 852edc4b0fac1..61e6181044abf 100644
--- a/docs/graphql/manual/actions/index.rst
+++ b/docs/graphql/core/actions/index.rst
@@ -20,7 +20,7 @@ logic using custom queries and mutations. Actions can be
 added to Hasura to handle various use cases such as data validation, data
 enrichment from external sources and any other complex business logic.
 
-.. thumbnail:: /img/graphql/manual/actions/actions-arch.png
+.. thumbnail:: /img/graphql/core/actions/actions-arch.png
    :class: no-shadow
    :alt: Actions high level architecture
 
diff --git a/docs/graphql/manual/actions/reuse-types-actions.rst b/docs/graphql/core/actions/reuse-types-actions.rst
similarity index 97%
rename from docs/graphql/manual/actions/reuse-types-actions.rst
rename to docs/graphql/core/actions/reuse-types-actions.rst
index 2984bdd6a5f2e..62ede8ce9d6b8 100644
--- a/docs/graphql/manual/actions/reuse-types-actions.rst
+++ b/docs/graphql/core/actions/reuse-types-actions.rst
@@ -98,7 +98,7 @@ You can create relationships for custom output types by:
 
      Set the output type relationship as shown below:
 
-     .. thumbnail:: /img/graphql/manual/actions/actions-relationship.png
+     .. thumbnail:: /img/graphql/core/actions/actions-relationship.png
         :alt: Console action relationship
 
      Hit ``Save`` to create the relationship.
diff --git a/docs/graphql/manual/actions/types/index.rst b/docs/graphql/core/actions/types/index.rst
similarity index 100%
rename from docs/graphql/manual/actions/types/index.rst
rename to docs/graphql/core/actions/types/index.rst
diff --git a/docs/graphql/manual/api-reference/config.rst b/docs/graphql/core/api-reference/config.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/config.rst
rename to docs/graphql/core/api-reference/config.rst
diff --git a/docs/graphql/manual/api-reference/explain.rst b/docs/graphql/core/api-reference/explain.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/explain.rst
rename to docs/graphql/core/api-reference/explain.rst
diff --git a/docs/graphql/manual/api-reference/graphql-api/index.rst b/docs/graphql/core/api-reference/graphql-api/index.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/graphql-api/index.rst
rename to docs/graphql/core/api-reference/graphql-api/index.rst
diff --git a/docs/graphql/manual/api-reference/graphql-api/mutation.rst b/docs/graphql/core/api-reference/graphql-api/mutation.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/graphql-api/mutation.rst
rename to docs/graphql/core/api-reference/graphql-api/mutation.rst
diff --git a/docs/graphql/manual/api-reference/graphql-api/query.rst b/docs/graphql/core/api-reference/graphql-api/query.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/graphql-api/query.rst
rename to docs/graphql/core/api-reference/graphql-api/query.rst
diff --git a/docs/graphql/manual/api-reference/health.rst b/docs/graphql/core/api-reference/health.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/health.rst
rename to docs/graphql/core/api-reference/health.rst
diff --git a/docs/graphql/manual/api-reference/index.rst b/docs/graphql/core/api-reference/index.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/index.rst
rename to docs/graphql/core/api-reference/index.rst
diff --git a/docs/graphql/manual/api-reference/pgdump.rst b/docs/graphql/core/api-reference/pgdump.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/pgdump.rst
rename to docs/graphql/core/api-reference/pgdump.rst
diff --git a/docs/graphql/manual/api-reference/pgtypes.csv b/docs/graphql/core/api-reference/pgtypes.csv
similarity index 100%
rename from docs/graphql/manual/api-reference/pgtypes.csv
rename to docs/graphql/core/api-reference/pgtypes.csv
diff --git a/docs/graphql/manual/api-reference/postgresql-types.rst b/docs/graphql/core/api-reference/postgresql-types.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/postgresql-types.rst
rename to docs/graphql/core/api-reference/postgresql-types.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/actions.rst b/docs/graphql/core/api-reference/schema-metadata-api/actions.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/actions.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/actions.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/computed-field.rst b/docs/graphql/core/api-reference/schema-metadata-api/computed-field.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/computed-field.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/computed-field.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/custom-functions.rst b/docs/graphql/core/api-reference/schema-metadata-api/custom-functions.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/custom-functions.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/custom-functions.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/custom-types.rst b/docs/graphql/core/api-reference/schema-metadata-api/custom-types.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/custom-types.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/custom-types.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/dataerrors.csv b/docs/graphql/core/api-reference/schema-metadata-api/dataerrors.csv
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/dataerrors.csv
rename to docs/graphql/core/api-reference/schema-metadata-api/dataerrors.csv
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/event-triggers.rst b/docs/graphql/core/api-reference/schema-metadata-api/event-triggers.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/event-triggers.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/event-triggers.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/index.rst b/docs/graphql/core/api-reference/schema-metadata-api/index.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/index.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/index.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/manage-metadata.rst b/docs/graphql/core/api-reference/schema-metadata-api/manage-metadata.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/manage-metadata.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/manage-metadata.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/permission.rst b/docs/graphql/core/api-reference/schema-metadata-api/permission.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/permission.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/permission.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/query-collections.rst b/docs/graphql/core/api-reference/schema-metadata-api/query-collections.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/query-collections.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/query-collections.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/relationship.rst b/docs/graphql/core/api-reference/schema-metadata-api/relationship.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/relationship.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/relationship.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/remote-relationships.rst b/docs/graphql/core/api-reference/schema-metadata-api/remote-relationships.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/remote-relationships.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/remote-relationships.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/remote-schemas.rst b/docs/graphql/core/api-reference/schema-metadata-api/remote-schemas.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/remote-schemas.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/remote-schemas.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/run-sql.rst b/docs/graphql/core/api-reference/schema-metadata-api/run-sql.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/run-sql.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/run-sql.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/scheduled-triggers.rst b/docs/graphql/core/api-reference/schema-metadata-api/scheduled-triggers.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/scheduled-triggers.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/scheduled-triggers.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/syntax-defs.rst b/docs/graphql/core/api-reference/schema-metadata-api/syntax-defs.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/syntax-defs.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/syntax-defs.rst
diff --git a/docs/graphql/manual/api-reference/schema-metadata-api/table-view.rst b/docs/graphql/core/api-reference/schema-metadata-api/table-view.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/schema-metadata-api/table-view.rst
rename to docs/graphql/core/api-reference/schema-metadata-api/table-view.rst
diff --git a/docs/graphql/manual/api-reference/version.rst b/docs/graphql/core/api-reference/version.rst
similarity index 100%
rename from docs/graphql/manual/api-reference/version.rst
rename to docs/graphql/core/api-reference/version.rst
diff --git a/docs/graphql/manual/auth/authentication/index.rst b/docs/graphql/core/auth/authentication/index.rst
similarity index 93%
rename from docs/graphql/manual/auth/authentication/index.rst
rename to docs/graphql/core/auth/authentication/index.rst
index 17d1dd92701a8..00ea7ef5465d6 100644
--- a/docs/graphql/manual/auth/authentication/index.rst
+++ b/docs/graphql/core/auth/authentication/index.rst
@@ -39,7 +39,7 @@ rules.
 
 Here's how a GraphQL request is processed in webhook mode:
 
-.. thumbnail:: /img/graphql/manual/auth/auth-webhook-overview.png
+.. thumbnail:: /img/graphql/core/auth/auth-webhook-overview.png
    :alt: Authentication using webhooks
 
 2. JWT (JSON Web Token)
@@ -51,7 +51,7 @@ evaluate access control rules.
 
 Here's how a GraphQL query is processed in JWT mode:
 
-.. thumbnail:: /img/graphql/manual/auth/auth-jwt-overview.png
+.. thumbnail:: /img/graphql/core/auth/auth-jwt-overview.png
    :alt: Authentication using JWT
 
 **See more details at:**
diff --git a/docs/graphql/manual/auth/authentication/jwt.rst b/docs/graphql/core/auth/authentication/jwt.rst
similarity index 99%
rename from docs/graphql/manual/auth/authentication/jwt.rst
rename to docs/graphql/core/auth/authentication/jwt.rst
index 61aa887675f80..12505d01e2d1f 100644
--- a/docs/graphql/manual/auth/authentication/jwt.rst
+++ b/docs/graphql/core/auth/authentication/jwt.rst
@@ -21,7 +21,7 @@ The idea is that your auth server will return JWT tokens, which are decoded and
 verified by the GraphQL engine, to authorize and get metadata about the request
 (``x-hasura-*`` values).
 
-.. thumbnail:: /img/graphql/manual/auth/jwt-auth.png
+.. thumbnail:: /img/graphql/core/auth/jwt-auth.png
    :alt: Authentication using JWT
 
 The JWT is decoded, the signature is verified, then it is asserted that the
@@ -543,7 +543,7 @@ https://hasura.io/jwt-config.
 The config generated from this page can be directly pasted in yaml files and command line arguments as it takes
 care of escaping new lines.
 
-.. thumbnail:: /img/graphql/manual/auth/jwt-config-generated.png
+.. thumbnail:: /img/graphql/core/auth/jwt-config-generated.png
    :width: 75%
    :alt: Generating JWT config
 
diff --git a/docs/graphql/manual/auth/authentication/unauthenticated-access.rst b/docs/graphql/core/auth/authentication/unauthenticated-access.rst
similarity index 100%
rename from docs/graphql/manual/auth/authentication/unauthenticated-access.rst
rename to docs/graphql/core/auth/authentication/unauthenticated-access.rst
diff --git a/docs/graphql/manual/auth/authentication/webhook.rst b/docs/graphql/core/auth/authentication/webhook.rst
similarity index 99%
rename from docs/graphql/manual/auth/authentication/webhook.rst
rename to docs/graphql/core/auth/authentication/webhook.rst
index 09d0171833dc6..4bb8a3e7545dd 100644
--- a/docs/graphql/manual/auth/authentication/webhook.rst
+++ b/docs/graphql/core/auth/authentication/webhook.rst
@@ -17,7 +17,7 @@ Introduction
 
 You can configure the GraphQL engine to use a webhook to authenticate all incoming requests to the Hasura GraphQL engine server. 
 
-.. thumbnail:: /img/graphql/manual/auth/webhook-auth.png
+.. thumbnail:: /img/graphql/core/auth/webhook-auth.png
    :alt: Authentication using webhooks
 
 .. admonition:: Prerequisite
diff --git a/docs/graphql/manual/auth/authorization/basics.rst b/docs/graphql/core/auth/authorization/basics.rst
similarity index 93%
rename from docs/graphql/manual/auth/authorization/basics.rst
rename to docs/graphql/core/auth/authorization/basics.rst
index 0c80dd1bcbab6..985a6081ca666 100644
--- a/docs/graphql/manual/auth/authorization/basics.rst
+++ b/docs/graphql/core/auth/authorization/basics.rst
@@ -18,7 +18,7 @@ Introduction
 
 To understand the basics of access control in Hasura, let's take a look at this analogy to a SQL query: 
 
-.. thumbnail:: /img/graphql/manual/auth/permissions-rule-analogy.png
+.. thumbnail:: /img/graphql/core/auth/permissions-rule-analogy.png
   :width: 70%
   :alt: Understanding access control in Hasura
 
@@ -80,7 +80,7 @@ Head to the ``GraphiQL`` tab in your console and try out the below query:
 You'll see that this results in a response that contains all the authors because by default the GraphQL
 query is accepted with **admin** permissions.
 
-.. thumbnail:: /img/graphql/manual/auth/fetch-authors.png
+.. thumbnail:: /img/graphql/core/auth/fetch-authors.png
    :alt: Run a query without access control
 
 Define access control rules
@@ -90,7 +90,7 @@ Now let's define an access control rule for the ``author`` table for a role ``us
 **Permissions** section of the table (``Data`` --> <table> --> ``Permissions`` tab) and define permissions
 as shown below:
 
-.. thumbnail:: /img/graphql/manual/auth/permission-basics-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/permission-basics-simple-example.png
    :alt: Define access control rules
 
 This permission rule reads as: "*For the role* ``user`` *, table* ``author`` *and operation* ``select``/``query``,
@@ -103,7 +103,7 @@ Let's run the same query as above but now with the ``X-Hasura-Role`` and ``X-Has
 variables also included to indicate role and user information. These session variables are passed in
 the ``Request Headers`` section of ``GraphiQL`` as highlighted below:
 
-.. thumbnail:: /img/graphql/manual/auth/permission-basics-query-with-access-control.png
+.. thumbnail:: /img/graphql/core/auth/permission-basics-query-with-access-control.png
    :alt: Run a query with access control
 
 As you can see, the results are now filtered based on the access control rule for the role ``user``
diff --git a/docs/graphql/manual/auth/authorization/common-roles-auth-examples.rst b/docs/graphql/core/auth/authorization/common-roles-auth-examples.rst
similarity index 93%
rename from docs/graphql/manual/auth/authorization/common-roles-auth-examples.rst
rename to docs/graphql/core/auth/authorization/common-roles-auth-examples.rst
index c925052a44680..e1ac0ea4c922a 100644
--- a/docs/graphql/manual/auth/authorization/common-roles-auth-examples.rst
+++ b/docs/graphql/core/auth/authorization/common-roles-auth-examples.rst
@@ -34,7 +34,7 @@ Anonymous (not logged in) users
 - Choose the right set of columns that will get exposed in the GraphQL schema as fields. Ensure that sensitive
   information will not be exposed.
 
-.. thumbnail:: /img/graphql/manual/auth/anonymous-role-examples.png
+.. thumbnail:: /img/graphql/core/auth/anonymous-role-examples.png
    :class: no-shadow
    :alt: Access control for an anonymous role
 
@@ -50,7 +50,7 @@ Logged-in users
 - Note that the ``X-Hasura-User-Id`` is a :ref:`dynamic session variable<roles_variables>` that comes in from
   your :ref:`auth webhook's <auth_webhooks>` response, or as a request header if you're testing.
 
-.. thumbnail:: /img/graphql/manual/auth/user-select-graphiql.png
+.. thumbnail:: /img/graphql/core/auth/user-select-graphiql.png
    :class: no-shadow
    :alt: Access control for a logged-in user
 
@@ -67,7 +67,7 @@ organisation either in the same table or via a related table.
 - ``X-Hasura-Org-Id`` is a :ref:`dynamic variable <roles_variables>` that is returned by your
   :ref:`auth webhook <auth_webhooks>` for an incoming GraphQL request.
 
-.. thumbnail:: /img/graphql/manual/auth/org-manager-graphiql.png
+.. thumbnail:: /img/graphql/core/auth/org-manager-graphiql.png
    :class: no-shadow
    :alt: Access control for a manager of an organisation
 
@@ -87,7 +87,7 @@ Let's say the "ownership" or "visibility" information for a data model (table) i
   - This reads as: Allow the role collaborator to select if ``article.collaborators`` has a ``collaborator_id``
     equal to that of ``X-Hasura-User-Id``.
 
-.. thumbnail:: /img/graphql/manual/auth/collaborator-relationship.png
+.. thumbnail:: /img/graphql/core/auth/collaborator-relationship.png
    :class: no-shadow
    :alt: Access control for collaborators of an article
 
@@ -152,7 +152,7 @@ Database Schema
 
 The following is a reference database schema for our example:
 
-.. thumbnail:: /img/graphql/manual/auth/multirole-example-db-schema.png
+.. thumbnail:: /img/graphql/core/auth/multirole-example-db-schema.png
    :alt: Database schema example for multiple roles per user
 
 Based on this schema, we'll create the following tables:
@@ -199,7 +199,7 @@ Relationships
 
 Create an array relationship named ``reviewers`` based on the foreign key constraint ``reviewers`` :: ``article_id``  →  ``articles`` :: ``id``:
 
-.. thumbnail:: /img/graphql/manual/auth/multirole-example-reviewers-array-relationship.png
+.. thumbnail:: /img/graphql/core/auth/multirole-example-reviewers-array-relationship.png
      :class: no-shadow
      :alt: Create an array relationship
 
@@ -243,7 +243,7 @@ Permissions for role ``author``
   
   b) :ref:`Column presets <column_presets>`: Session-variable-based column preset for the ``author_id`` column to automatically insert the user's ID i.e. the ``X-Hasura-User-Id`` session-variable's value. It also helps us avoid explicitly passing the user's ID in the insert mutation.
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-author-insert.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-author-insert.png
      :alt: Permissions for the role author
 
   Notice how we don't need to have an explicit row-level permission (*a custom check*) as only authenticated users with the role ``author`` can perform this action. As we have a column preset for the ``author_id`` column that automatically takes the author's ID (*and the* ``id`` *column is an auto-increment integer field*), we only need to allow access to the ``title`` column.
@@ -252,7 +252,7 @@ Permissions for role ``author``
 
   Again, we'll  use **column-level** permissions to restrict access to certain columns. Additionally, we need to define row-level permissions (*a custom check*) to restrict access to only those articles authored by the current user:
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-author-select.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-author-select.png
      :alt: Column access for the role author
   
   The row-level permission rule shown here translates to "*if the value in the* ``author_id`` *column of this row is equal to the user's ID i.e. the* ``X-Hasura-User-Id`` *session-variable's value, allow access to it*". 
@@ -264,7 +264,7 @@ Permissions for role ``reviewer``
   
   For this use-case, we'll use :ref:`relationship or nested-object permissions<relationships-in-permissions>` based on the array relationship ``reviewers`` to restrict access to assigned articles only.
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-reviewer-update.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-reviewer-update.png
      :alt: Permissions for the role reviewer
 
   The array-relationship based permission rule in the above image reads as "*if the ID of any reviewer assigned to this article is equal to the user's ID i.e. the* ``X-Hasura-User-Id`` *session-variable's value, allow access to it*". The columns' access is restricted using the column-level permissions highlighted above.
@@ -273,7 +273,7 @@ Permissions for role ``reviewer``
 
   This permission rule is pretty much the same as the one for update, the only difference being the  column-level permissions.  
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-reviewer-select.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-reviewer-select.png
      :alt: Column access for the role reviewer
 
 Permissions for role ``editor``
@@ -283,14 +283,14 @@ Permissions for role ``editor``
 
   This is a straightforward rule - there's no need for any row-level permissions since editors have access to all rows and they can *read* all columns.
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-editor-select.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-editor-select.png
      :alt: Permissions for the role editor
 
 * **Allow editors to update an article**
 
   There's no need for row-level permissions in this case either but we need to restrict access to certain columns only:
 
-  .. thumbnail:: /img/graphql/manual/auth/multirole-example-editor-update.png
+  .. thumbnail:: /img/graphql/core/auth/multirole-example-editor-update.png
      :alt: Column access for the role editor
 
 
diff --git a/docs/graphql/manual/auth/authorization/index.rst b/docs/graphql/core/auth/authorization/index.rst
similarity index 96%
rename from docs/graphql/manual/auth/authorization/index.rst
rename to docs/graphql/core/auth/authorization/index.rst
index b28a1a7c0dfef..d35c34cbf3728 100644
--- a/docs/graphql/manual/auth/authorization/index.rst
+++ b/docs/graphql/core/auth/authorization/index.rst
@@ -23,7 +23,7 @@ session variables. Other session variables can be passed by your auth service as
 
 **For example:**
 
-.. thumbnail:: /img/graphql/manual/auth/hasura-perms.png
+.. thumbnail:: /img/graphql/core/auth/hasura-perms.png
    :width: 80 %
    :alt: Create a permission rule
 
diff --git a/docs/graphql/manual/auth/authorization/modeling-roles.rst.wip b/docs/graphql/core/auth/authorization/modeling-roles.rst.wip
similarity index 98%
rename from docs/graphql/manual/auth/authorization/modeling-roles.rst.wip
rename to docs/graphql/core/auth/authorization/modeling-roles.rst.wip
index 65a8a2d6ab997..516321e2046c4 100644
--- a/docs/graphql/manual/auth/authorization/modeling-roles.rst.wip
+++ b/docs/graphql/core/auth/authorization/modeling-roles.rst.wip
@@ -18,7 +18,7 @@ Roles can be typically be modeled in two ways:
 1. **Hierarchical roles**: Access scopes are nested depending on available roles. `Roles in Github for organisations <https://help.github.com/en/articles/managing-peoples-access-to-your-organization-with-roles>`_
    is a great example of such modelling where access scopes are inherited by deeper roles:
 
-   .. thumbnail:: /img/graphql/manual/auth/github-org-hierarchical-roles.png
+   .. thumbnail:: /img/graphql/core/auth/github-org-hierarchical-roles.png
 
 2. **Flat roles**: Non-hierarchical roles with each role requiring an independent access scope to be defined.
 
diff --git a/docs/graphql/manual/auth/authorization/permission-rules.rst b/docs/graphql/core/auth/authorization/permission-rules.rst
similarity index 91%
rename from docs/graphql/manual/auth/authorization/permission-rules.rst
rename to docs/graphql/core/auth/authorization/permission-rules.rst
index 22c35d9c801bb..2c8403e5ac85f 100644
--- a/docs/graphql/manual/auth/authorization/permission-rules.rst
+++ b/docs/graphql/core/auth/authorization/permission-rules.rst
@@ -18,7 +18,7 @@ Introduction
 Access control rules in Hasura are defined at a role, table and action (*insert, update, select, delete*)
 level granularity:
 
-.. thumbnail:: /img/graphql/manual/auth/permission-rule-granularity.png
+.. thumbnail:: /img/graphql/core/auth/permission-rule-granularity.png
    :alt: Access control rules in Hasura
 
 Requests to Hasura should contain the reserved session variable ``X-Hasura-Role`` to indicate the requesting
@@ -108,11 +108,11 @@ See the :ref:`API reference <MetadataOperator>` for a list of all supported colu
 types:
 
 
-.. thumbnail:: /img/graphql/manual/auth/operators-for-integer-types.png
+.. thumbnail:: /img/graphql/core/auth/operators-for-integer-types.png
    :width: 40%
    :alt: Column operators for integer types
 
-.. thumbnail:: /img/graphql/manual/auth/operators-for-text-types.png
+.. thumbnail:: /img/graphql/core/auth/operators-for-text-types.png
    :width: 40%
    :alt: Column operators for text types
 
@@ -122,19 +122,19 @@ Using boolean expressions
 The following is an example of a simple boolean expression to restrict access for ``select`` to rows where
 the value in the ``id`` column is greater than 10:
 
-.. thumbnail:: /img/graphql/manual/auth/simple-boolean-expression.png
+.. thumbnail:: /img/graphql/core/auth/simple-boolean-expression.png
    :alt: Using boolean expressions to build rules
 
 You can construct more complex boolean expressions using the ``_and``, ``_or`` and ``not`` operators:
 
-.. thumbnail:: /img/graphql/manual/auth/boolean-operators.png
+.. thumbnail:: /img/graphql/core/auth/boolean-operators.png
    :alt: Using more complex boolean expressions to build rules
 
 **For example**, using the ``_and`` operator, you can construct a rule to restrict access for ``select`` to rows where
 the value in the ``id`` column is greater than 10 **and** the value in the ``name`` column starts with "a"
 or "A":
 
-.. thumbnail:: /img/graphql/manual/auth/composite-boolean-expression.png
+.. thumbnail:: /img/graphql/core/auth/composite-boolean-expression.png
    :alt: Example of a rule with the _and operator
 
 Using session variables
@@ -148,7 +148,7 @@ to construct a rule to restrict access for ``select`` to rows in the ``articles`
 ``id`` column is equal to the value in the session variable (*assuming this variable is being used to indicate
 the author's ID*):
 
-.. thumbnail:: /img/graphql/manual/auth/session-variables-in-permissions-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/session-variables-in-permissions-simple-example.png
    :alt: Using session variables to build rules
 
 .. _relationships-in-permissions:
@@ -164,7 +164,7 @@ called ``agent`` (*an author can have an agent*) and we want to allow users with
 the details of the authors who they manage in ``authors`` table. We can define the following permission rule
 that uses the aforementioned object relationship:
 
-.. thumbnail:: /img/graphql/manual/auth/nested-object-permission-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/nested-object-permission-simple-example.png
    :alt: Using a nested object to build rules
 
 This permission rule reads as "*if the author's agent's*  ``id``  *is the same as the requesting user's*
@@ -191,7 +191,7 @@ our table.
 column in the ``users`` table is set to ``true``. Let's assume the user's id is passed in the ``X-Hasura-User-ID``
 session variable.
 
-.. thumbnail:: /img/graphql/manual/auth/exists-permission-example.png
+.. thumbnail:: /img/graphql/core/auth/exists-permission-example.png
    :alt: Use an unrelated table to build rules
 
 This permission rule reads as "*if there exists a row in the table* ``users`` *whose*  ``id``  *is the same as the requesting user's*
@@ -204,7 +204,7 @@ Column-level permissions
 Column-level permissions determine access to columns in the rows that are accessible based on row-level
 permissions. These permissions are simple selections:
 
-.. thumbnail:: /img/graphql/manual/auth/column-level-permissions.png
+.. thumbnail:: /img/graphql/core/auth/column-level-permissions.png
    :alt: Column level permissions
 
 In this example, the role ``author`` has only partial access to columns of the accessible rows for
@@ -218,7 +218,7 @@ Row fetch limit
 In the case of ``select`` operations, the number of rows to be returned in the response can be limited
 using this configuration:
 
-.. thumbnail:: /img/graphql/manual/auth/limit-rows-for-select.png
+.. thumbnail:: /img/graphql/core/auth/limit-rows-for-select.png
    :alt: Row fetch limit
 
 In the above example, this configuration  restricts the number of accessible rows (*based on the rule*:
@@ -232,7 +232,7 @@ Aggregation queries permissions
 In the case of ``select`` operations, access to :ref:`aggregation queries <aggregation_queries>`
 can be restricted for a given role using this configuration.
 
-.. thumbnail:: /img/graphql/manual/auth/aggregation-query-permissions.png
+.. thumbnail:: /img/graphql/core/auth/aggregation-query-permissions.png
    :alt: Aggregation queries permissions
 
 In the above example, the role ``user`` is allowed to make aggregation queries.
diff --git a/docs/graphql/manual/auth/authorization/reference-permissions.rst.wip b/docs/graphql/core/auth/authorization/reference-permissions.rst.wip
similarity index 92%
rename from docs/graphql/manual/auth/authorization/reference-permissions.rst.wip
rename to docs/graphql/core/auth/authorization/reference-permissions.rst.wip
index f6d0eb985f40b..91c7876d5303a 100644
--- a/docs/graphql/manual/auth/authorization/reference-permissions.rst.wip
+++ b/docs/graphql/core/auth/authorization/reference-permissions.rst.wip
@@ -13,7 +13,7 @@ How permissions work
 
 Access control rules in Hasura are defined at a role, table and action (*insert, update, select, delete*) level granulaity:
 
-.. thumbnail:: /img/graphql/manual/auth/permission-rule-granularity.png
+.. thumbnail:: /img/graphql/core/auth/permission-rule-granularity.png
 
 Requests to Hasura should contain the reserved session variable ``X-Hasura-Role`` to indicate the requesting user's role, and the table and action information is inferred from the request itself. This information is used to determine the right permission rule to be applied (*if one has been defined*) to the incoming request.
 
@@ -65,7 +65,7 @@ If you make this query as an admin in the Graphiql section of the console and cl
 
 Let's say you now define the following permission rule on the ``authors`` table (*as described in the example* :doc:`here <basics>`):
 
-.. thumbnail:: /img/graphql/manual/auth/permission-basics-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/permission-basics-simple-example.png
 
 If you were to run the same query with the role ``user`` (``X-Hasura-Role`` = ``user``) and as a user with ``id`` = ``1`` (``X-Hasura-User-ID`` = ``1``) and hit the **Analyze** button, you will see the following generated SQL:
 
@@ -149,24 +149,24 @@ Type-based operators (*depending on the column type*) are available for construc
 E.g. the following two images illustrate the different operators available for ``integer`` and ``text`` types:
 
 
-.. thumbnail:: /img/graphql/manual/auth/operators-for-integer-types.png
+.. thumbnail:: /img/graphql/core/auth/operators-for-integer-types.png
 
-.. thumbnail:: /img/graphql/manual/auth/operators-for-text-types.png
+.. thumbnail:: /img/graphql/core/auth/operators-for-text-types.png
 
 **Using boolean expressions**
 #############################
 
 The following is an example of a simple boolean expression to restrict access for ``select`` to rows where the value in the ``id`` column is greater than 10:
 
-.. thumbnail:: /img/graphql/manual/auth/simple-boolean-expression.png
+.. thumbnail:: /img/graphql/core/auth/simple-boolean-expression.png
 
 You can construct more complex boolean expression using the ``_and``, ``_or`` and ``not`` operators:
 
-.. thumbnail:: /img/graphql/manual/auth/boolean-operators.png
+.. thumbnail:: /img/graphql/core/auth/boolean-operators.png
 
 E.g. using the ``_and`` operator, you can construct a rule to restrict access for ``select`` to rows where the value in the ``id`` column is greater than 10 **and** the value in the ``name`` column starts with "a" or "A":
 
-.. thumbnail:: /img/graphql/manual/auth/composite-boolean-expression.png
+.. thumbnail:: /img/graphql/core/auth/composite-boolean-expression.png
 
 .. Using roles
 .. ###########
@@ -179,7 +179,7 @@ Session variable, that have been resolved from authentication tokens by either y
 
 E.g. to allow an ``author`` to access only their articles, you can use the ``X-Hasura-User-ID`` session variable to construct a rule to restrict access for ``select`` to rows in the ``articles`` table where the value in the ``id`` column is equal to the value in the session variable (*assuming this variable is being used to indicate the author's ID*):
 
-.. thumbnail:: /img/graphql/manual/auth/session-variables-in-permissions-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/session-variables-in-permissions-simple-example.png
 
 .. _relationships-in-permissions:
 
@@ -190,7 +190,7 @@ You can leverage :doc:`relationships <../../schema/relationships/index>` to defi
 
 For e.g. let's say you have an object relationship called ``agent`` from the ``authors`` table to another table called ``agent`` (*an author can have an agent*) and we want to allow users with the role ``agent`` to access the details of the authors who they manage in ``authors`` table. We can define the following permission rule that uses the aforementioned object relationship:
 
-.. thumbnail:: /img/graphql/manual/auth/nested-object-permission-simple-example.png
+.. thumbnail:: /img/graphql/core/auth/nested-object-permission-simple-example.png
 
 This permission rule reads as "*if the author's agent's*  ``id``  *is the same as the requesting user's* ``id`` *, allow access to the author's details*.
 
@@ -208,7 +208,7 @@ Column-level permissions
 ^^^^^^^^^^^^^^^^^^^^^^^^
 Column-level permissions determine access to columns in the rows that accessible based on row-level permissions. These permissions are simple selections: 
 
-.. thumbnail:: /img/graphql/manual/auth/column-level-permissions.png
+.. thumbnail:: /img/graphql/core/auth/column-level-permissions.png
 
 In this example, the role ``author`` has only partial access to columns of the accessible rows for the ``select`` operation.
 
@@ -219,7 +219,7 @@ Limiting number of rows
 
 In the case of ``select`` operations, the number of rows to be returned in the response can be limited using this configuration:
 
-.. thumbnail:: /img/graphql/manual/auth/limit-rows-for-select.png
+.. thumbnail:: /img/graphql/core/auth/limit-rows-for-select.png
 
 In the above example, this configuration  restricts the number of accessible rows (*based on the rule*: ``{"id":{"_eq":"X-Hasura-User-Id"}}``) to 20. 
 
@@ -230,7 +230,7 @@ Aggregation queries permissions
 
 In the case of ``select`` operations, access to :doc:`aggregation queries <../../queries/aggregation-queries>` can be restricted for a given role using this configuration.
 
-.. thumbnail:: /img/graphql/manual/auth/aggregation-query-permissions.png
+.. thumbnail:: /img/graphql/core/auth/aggregation-query-permissions.png
 
 In the above example, the role ``user`` is allowed to make aggregation queries.
 
diff --git a/docs/graphql/manual/auth/authorization/role-multiple-rules.rst b/docs/graphql/core/auth/authorization/role-multiple-rules.rst
similarity index 93%
rename from docs/graphql/manual/auth/authorization/role-multiple-rules.rst
rename to docs/graphql/core/auth/authorization/role-multiple-rules.rst
index 144b2799c637f..65e3155d73fff 100644
--- a/docs/graphql/manual/auth/authorization/role-multiple-rules.rst
+++ b/docs/graphql/core/auth/authorization/role-multiple-rules.rst
@@ -53,7 +53,7 @@ Step 2: Create a relationship
 For the table ``user_info``, :ref:`create a manual object relationship <create_manual_relationships>` called
 ``private_info`` using ``user_info : id -> user_private : user_id``:
 
-.. thumbnail:: /img/graphql/manual/auth/multiple-rules-create-manual-relationship.png
+.. thumbnail:: /img/graphql/core/auth/multiple-rules-create-manual-relationship.png
    :alt: Create a manual object relationship
 
 Step 3: Define permissions
@@ -63,13 +63,13 @@ For the role ``user``, create the following permissions for ``select``:
 
 - Table ``user_info``: allow access to ``id``, ``name`` and ``city`` without any row conditions.
 
-.. thumbnail:: /img/graphql/manual/auth/multiple-rules-define-public-permissions.png
+.. thumbnail:: /img/graphql/core/auth/multiple-rules-define-public-permissions.png
    :alt: Column access for the role user
 
 - View ``user_private``: allow access to ``id``, ``phone``, ``email`` and ``address`` if the ``user-id``
   passed in the session variable is equal to the row's ``user_id``.
 
-.. thumbnail:: /img/graphql/manual/auth/multiple-rules-define-private-permissions.png
+.. thumbnail:: /img/graphql/core/auth/multiple-rules-define-private-permissions.png
    :alt: Column access for the role user based on row level permissions
 
 Step 4: Query with appropriate access control
diff --git a/docs/graphql/manual/auth/authorization/roles-variables.rst b/docs/graphql/core/auth/authorization/roles-variables.rst
similarity index 99%
rename from docs/graphql/manual/auth/authorization/roles-variables.rst
rename to docs/graphql/core/auth/authorization/roles-variables.rst
index 8cc308bbe7803..33c7d4bd73755 100644
--- a/docs/graphql/manual/auth/authorization/roles-variables.rst
+++ b/docs/graphql/core/auth/authorization/roles-variables.rst
@@ -107,7 +107,7 @@ Roles are typically modelled in two ways:
 1. **Hierarchical roles**: Access scopes are nested depending on available roles. `Roles in Github for organisations <https://help.github.com/en/articles/managing-peoples-access-to-your-organization-with-roles>`_
    is a great example of such modelling where access scopes are inherited by deeper roles:
 
-   .. thumbnail:: /img/graphql/manual/auth/github-org-hierarchical-roles.png
+   .. thumbnail:: /img/graphql/core/auth/github-org-hierarchical-roles.png
       :alt: Hierarchical roles
 
 2. **Flat roles**: Non-hierarchical roles with each role requiring an independent access scope to be defined.
diff --git a/docs/graphql/manual/auth/authorization/use-cases.rst.wip b/docs/graphql/core/auth/authorization/use-cases.rst.wip
similarity index 89%
rename from docs/graphql/manual/auth/authorization/use-cases.rst.wip
rename to docs/graphql/core/auth/authorization/use-cases.rst.wip
index d60149f6412c7..beb02c744d4b9 100644
--- a/docs/graphql/manual/auth/authorization/use-cases.rst.wip
+++ b/docs/graphql/core/auth/authorization/use-cases.rst.wip
@@ -18,7 +18,7 @@ Head to the ``Permissions`` tab of the ``author`` table.
 
 Now add a ``select`` access control rule for the ``user`` role on the ``author`` table:
 
-.. thumbnail:: /img/graphql/manual/auth/author-select-perms.png
+.. thumbnail:: /img/graphql/core/auth/author-select-perms.png
 
 This rule reads as:
 
@@ -44,7 +44,7 @@ This rule reads as:
 Now, let's make the same query as above but also include two dynamic authorization variables ``X-Hasura-Role`` and
 ``X-Hasura-User-Id`` via request headers. These will automatically get used according to the permission rule we set up.
 
-.. thumbnail:: /img/graphql/manual/auth/query-with-perms.png
+.. thumbnail:: /img/graphql/core/auth/query-with-perms.png
 
 You can notice above how the same query now only includes the right slice of data.
 
@@ -83,7 +83,7 @@ We can restrict the columns of a table that a particular role has access to.
 
 Head to the ``Permissions`` tab of the table and edit the ``Select`` permissions for the role:
 
-.. thumbnail:: /img/graphql/manual/auth/restrict-columns.png
+.. thumbnail:: /img/graphql/core/auth/restrict-columns.png
 
 .. _limit_rows:
 
@@ -94,7 +94,7 @@ We can set a hard limit on the maximum number of rows that will be returned in a
 
 Head to the ``Permissions`` tab of the table and edit the ``Select`` permissions for the role:
 
-.. thumbnail:: /img/graphql/manual/auth/limit-results.png
+.. thumbnail:: /img/graphql/core/auth/limit-results.png
 
 
 .. _using-relationships-in-permissions:
@@ -105,16 +105,16 @@ You can leverage relationships to define permission rules with fields from a nes
 
 * An author/articles schema where an article can have one or more reviewers i.e. users with the role ``reviewer`` can only edit those articles that have been assigned to them:
 
-.. thumbnail:: /img/graphql/manual/auth/schema-for-nested-object-based-permissions.png
+.. thumbnail:: /img/graphql/core/auth/schema-for-nested-object-based-permissions.png
 
 * The foreign key constraint from ``reviewers`` :: ``article_id``  →  ``articles`` :: ``id`` is used for an array relationship called  ``reviewers`` in the ``articles`` table:
 
-.. thumbnail:: /img/graphql/manual/auth/array-relationship-reviewers.png
+.. thumbnail:: /img/graphql/core/auth/array-relationship-reviewers.png
    :class: no-shadow
 
 We can use this relationship in a permission rule for the ``articles`` table  to limit access for users with the role ``reviewer`` to only assigned rows:
 
-.. thumbnail:: /img/graphql/manual/auth/nested-object-permissions-rule.gif
+.. thumbnail:: /img/graphql/core/auth/nested-object-permissions-rule.gif
 
 Via the relationship, we are using the ``reviewer_id`` field of the nested object ``reviewers`` in the the above permission rule that reads as "Allow updating an article if the **reviewer_id of any of the reviewers assigned to this article** is the same as the requesting user's id (*which is sent in the resolved session variable* ``X-Hasura-User-ID``)".
 
@@ -144,12 +144,12 @@ Let's say we have the following test data for the list of reviewers:
 
 Applying the above permission rule for "update" to "select" operation also, let's query the  ``articles`` table to watch this permission rule in action:
 
-.. thumbnail:: /img/graphql/manual/auth/restricted-data-for-role-reviewer.png
+.. thumbnail:: /img/graphql/core/auth/restricted-data-for-role-reviewer.png
   :class: no-shadow
 
 As we've made this query with the role ``reviewer`` and user ID ``5`` (*highlighted in the request headers in the above image*), we can only query those articles for which this user is a reviewer. This will be the case for update mutations too. As the user with id ``5`` does not have access to article with id ``2`` (*refer to the table above*), the following mutation will not update any rows of the ``articles`` table:
 
-.. thumbnail:: /img/graphql/manual/auth/unsuccessful-mutation-for-role-reviewer.png
+.. thumbnail:: /img/graphql/core/auth/unsuccessful-mutation-for-role-reviewer.png
   :class: no-shadow
    
 .. admonition:: Array and Object relationships work similarly
diff --git a/docs/graphql/manual/auth/config.rst.wip b/docs/graphql/core/auth/config.rst.wip
similarity index 100%
rename from docs/graphql/manual/auth/config.rst.wip
rename to docs/graphql/core/auth/config.rst.wip
diff --git a/docs/graphql/manual/auth/index.rst b/docs/graphql/core/auth/index.rst
similarity index 96%
rename from docs/graphql/manual/auth/index.rst
rename to docs/graphql/core/auth/index.rst
index b1b16f130a436..f0497d9101a18 100644
--- a/docs/graphql/manual/auth/index.rst
+++ b/docs/graphql/core/auth/index.rst
@@ -15,7 +15,7 @@ Authentication & Authorization
 In Hasura, access control or authorization is based on **roles**. Let's take a look at how this works
 when the GraphQL engine receives a request:
 
-.. thumbnail:: /img/graphql/manual/auth/auth-high-level-overview.png
+.. thumbnail:: /img/graphql/core/auth/auth-high-level-overview.png
    :alt: Authentication and authorization with Hasura
 
 As you can see from this:
diff --git a/docs/graphql/manual/business-logic/index.rst.wip b/docs/graphql/core/business-logic/index.rst.wip
similarity index 95%
rename from docs/graphql/manual/business-logic/index.rst.wip
rename to docs/graphql/core/business-logic/index.rst.wip
index bbb9bcc7f1792..d5e2aaef93506 100644
--- a/docs/graphql/manual/business-logic/index.rst.wip
+++ b/docs/graphql/core/business-logic/index.rst.wip
@@ -15,7 +15,7 @@ GraphQL engine/Postgres, different avenues are recommended for introducing such
 - **Post-CRUD**: :ref:`event-triggers`
 - :ref:`derived-data`
 
-.. thumbnail:: /img/graphql/manual/business-logic/custom-business-logic.png
+.. thumbnail:: /img/graphql/core/business-logic/custom-business-logic.png
 
 .. _remote-schemas:
 
@@ -35,7 +35,7 @@ To support these kinds of business logic, a custom GraphQL schema with resolvers
 logic is needed (*see link below for boilerplates*). This remote schema can then be merged with GraphQL engine's
 schema using the console. Here's a reference architecture diagram for such a setup:
 
-.. thumbnail:: /img/graphql/manual/schema/schema-stitching-v1-arch-diagram.png
+.. thumbnail:: /img/graphql/core/schema/schema-stitching-v1-arch-diagram.png
 
 For more details, links to boilerplates for custom GraphQL servers, etc. please head to :doc:`../remote-schemas/index`.
 
@@ -56,7 +56,7 @@ If your business logic is stateful, it can even store its state back in the Post
 with GraphQL engine, allowing your frontend app to offer a reactive user experience, where the app uses GraphQL
 subscriptions to listen to updates from your webhook via Postgres.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/database-event-triggers.png
+.. thumbnail:: /img/graphql/core/event-triggers/database-event-triggers.png
 
 Event triggers are ideal for use cases such as the following:
 
diff --git a/docs/graphql/manual/deployment/allow-list.rst b/docs/graphql/core/deployment/allow-list.rst
similarity index 100%
rename from docs/graphql/manual/deployment/allow-list.rst
rename to docs/graphql/core/deployment/allow-list.rst
diff --git a/docs/graphql/manual/deployment/compression.rst b/docs/graphql/core/deployment/compression.rst
similarity index 100%
rename from docs/graphql/manual/deployment/compression.rst
rename to docs/graphql/core/deployment/compression.rst
diff --git a/docs/graphql/manual/deployment/custom-docker-images.rst b/docs/graphql/core/deployment/custom-docker-images.rst
similarity index 100%
rename from docs/graphql/manual/deployment/custom-docker-images.rst
rename to docs/graphql/core/deployment/custom-docker-images.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/azure-container-instances-postgres.rst b/docs/graphql/core/deployment/deployment-guides/azure-container-instances-postgres.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/azure-container-instances-postgres.rst
rename to docs/graphql/core/deployment/deployment-guides/azure-container-instances-postgres.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/digital-ocean-one-click.rst b/docs/graphql/core/deployment/deployment-guides/digital-ocean-one-click.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/digital-ocean-one-click.rst
rename to docs/graphql/core/deployment/deployment-guides/digital-ocean-one-click.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/docker.rst b/docs/graphql/core/deployment/deployment-guides/docker.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/docker.rst
rename to docs/graphql/core/deployment/deployment-guides/docker.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/google-kubernetes-engine-cloud-sql.rst b/docs/graphql/core/deployment/deployment-guides/google-kubernetes-engine-cloud-sql.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/google-kubernetes-engine-cloud-sql.rst
rename to docs/graphql/core/deployment/deployment-guides/google-kubernetes-engine-cloud-sql.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/heroku.rst b/docs/graphql/core/deployment/deployment-guides/heroku.rst
similarity index 96%
rename from docs/graphql/manual/deployment/deployment-guides/heroku.rst
rename to docs/graphql/core/deployment/deployment-guides/heroku.rst
index 128f5312161fc..08b6d22cfdd40 100644
--- a/docs/graphql/manual/deployment/deployment-guides/heroku.rst
+++ b/docs/graphql/core/deployment/deployment-guides/heroku.rst
@@ -42,7 +42,7 @@ Click the below button to deploy Hasura on Heroku in a few seconds:
    If you don't have an account on Heroku, you need to sign up on Heroku. You won't need a credit card, and once you
    sign up you'll be redirected to your Heroku app creation page automatically.
 
-.. thumbnail:: /img/graphql/manual/guides/heroku-app.png
+.. thumbnail:: /img/graphql/core/guides/heroku-app.png
    :alt: Deploy to Heroku 
 
 Heroku's free Postgres add-on is automatically provisioned.
@@ -143,7 +143,7 @@ Step 2: Remove the created Postgres add-on in the app
 
 Head to your Heroku dashboard and delete the Postgres add-on created in the previous step:
 
-.. thumbnail:: /img/graphql/manual/deployment/remove-heroku-postgres-addon.png
+.. thumbnail:: /img/graphql/core/deployment/remove-heroku-postgres-addon.png
    :alt: Delete the Postgres add-on
 
 Step 3: Configure environment variables
@@ -152,7 +152,7 @@ Step 3: Configure environment variables
 Now configure the ``DATABASE_URL`` with your existing Heroku Postgres database URL and a ``HASURA_GRAPHQL_ADMIN_SECRET``
 if you want to :ref:`secure your endpoint <heroku_secure>`.
 
-.. thumbnail:: /img/graphql/manual/deployment/heroku-database-url-access.png
+.. thumbnail:: /img/graphql/core/deployment/heroku-database-url-access.png
    :alt: Configure environment variables
 
 .. note::
@@ -221,13 +221,13 @@ Add an admin secret
 
 Head to the config-vars URL on your Heroku dashboard and set the ``HASURA_GRAPHQL_ADMIN_SECRET`` environment variable.
 
-.. thumbnail:: /img/graphql/manual/deployment/secure-heroku.png
+.. thumbnail:: /img/graphql/core/deployment/secure-heroku.png
    :alt: Add an admin secret
 
 Setting this environment variable will automatically restart the dyno. Now when you access your console, you'll be
 prompted for the admin secret key.
 
-.. thumbnail:: /img/graphql/manual/deployment/access-key-console.png
+.. thumbnail:: /img/graphql/core/deployment/access-key-console.png
    :alt: Prompt for the admin secret
 
 .. note::
diff --git a/docs/graphql/manual/deployment/deployment-guides/index.rst b/docs/graphql/core/deployment/deployment-guides/index.rst
similarity index 96%
rename from docs/graphql/manual/deployment/deployment-guides/index.rst
rename to docs/graphql/core/deployment/deployment-guides/index.rst
index 5cc0eb6e99ddb..75bdd290a50d3 100644
--- a/docs/graphql/manual/deployment/deployment-guides/index.rst
+++ b/docs/graphql/core/deployment/deployment-guides/index.rst
@@ -58,7 +58,7 @@ Choose from the full list of deployment guides:
    :titlesonly:
    :hidden:
 
-   Using Hasura Cloud <https://hasura.io/docs/1.0/cloud/getting-started/index.html>
+   Using Hasura Cloud <https://hasura.io/docs/1.0/graphql/cloud/getting-started/index.html>
    Using Docker <docker>
    Using Kubernetes <kubernetes>
    Using Heroku (one-click) <heroku>
diff --git a/docs/graphql/manual/deployment/deployment-guides/kubernetes.rst b/docs/graphql/core/deployment/deployment-guides/kubernetes.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/kubernetes.rst
rename to docs/graphql/core/deployment/deployment-guides/kubernetes.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/nhost-one-click.rst b/docs/graphql/core/deployment/deployment-guides/nhost-one-click.rst
similarity index 100%
rename from docs/graphql/manual/deployment/deployment-guides/nhost-one-click.rst
rename to docs/graphql/core/deployment/deployment-guides/nhost-one-click.rst
diff --git a/docs/graphql/manual/deployment/deployment-guides/render-one-click.rst b/docs/graphql/core/deployment/deployment-guides/render-one-click.rst
similarity index 92%
rename from docs/graphql/manual/deployment/deployment-guides/render-one-click.rst
rename to docs/graphql/core/deployment/deployment-guides/render-one-click.rst
index 4d4f7e9865243..69511737dfb64 100644
--- a/docs/graphql/manual/deployment/deployment-guides/render-one-click.rst
+++ b/docs/graphql/core/deployment/deployment-guides/render-one-click.rst
@@ -34,7 +34,7 @@ new managed PostgreSQL database wired up to your Hasura instance.
 
 You will see the Hasura web service and PostgreSQL instance to be created:
 
-.. thumbnail:: /img/graphql/manual/deployment/deploy-to-render-hasura-iac.png
+.. thumbnail:: /img/graphql/core/deployment/deploy-to-render-hasura-iac.png
    :alt: Deploy To Render Hasura Page
 
 That's it! Read on to configure your Hasura instance.
@@ -44,7 +44,7 @@ Access your Hasura Console
 
 Once **Deploy to Render** succeeds, you can click through to your Hasura service page on Render's dashboard.
 
-.. thumbnail:: /img/graphql/manual/deployment/deploy-to-render-hasura-header.png
+.. thumbnail:: /img/graphql/core/deployment/deploy-to-render-hasura-header.png
    :alt: Render Hasura Header
 
 You can monitor the deployment of the Hasura web service from the **Logs** tab. Once the service is up, use the link on the service page to access your Hasura console:
diff --git a/docs/graphql/manual/deployment/downgrading.rst b/docs/graphql/core/deployment/downgrading.rst
similarity index 100%
rename from docs/graphql/manual/deployment/downgrading.rst
rename to docs/graphql/core/deployment/downgrading.rst
diff --git a/docs/graphql/manual/deployment/enable-https.rst b/docs/graphql/core/deployment/enable-https.rst
similarity index 100%
rename from docs/graphql/manual/deployment/enable-https.rst
rename to docs/graphql/core/deployment/enable-https.rst
diff --git a/docs/graphql/manual/deployment/graphql-engine-flags/config-examples.rst b/docs/graphql/core/deployment/graphql-engine-flags/config-examples.rst
similarity index 100%
rename from docs/graphql/manual/deployment/graphql-engine-flags/config-examples.rst
rename to docs/graphql/core/deployment/graphql-engine-flags/config-examples.rst
diff --git a/docs/graphql/manual/deployment/graphql-engine-flags/index.rst b/docs/graphql/core/deployment/graphql-engine-flags/index.rst
similarity index 100%
rename from docs/graphql/manual/deployment/graphql-engine-flags/index.rst
rename to docs/graphql/core/deployment/graphql-engine-flags/index.rst
diff --git a/docs/graphql/manual/deployment/graphql-engine-flags/reference.rst b/docs/graphql/core/deployment/graphql-engine-flags/reference.rst
similarity index 100%
rename from docs/graphql/manual/deployment/graphql-engine-flags/reference.rst
rename to docs/graphql/core/deployment/graphql-engine-flags/reference.rst
diff --git a/docs/graphql/manual/deployment/index.rst b/docs/graphql/core/deployment/index.rst
similarity index 100%
rename from docs/graphql/manual/deployment/index.rst
rename to docs/graphql/core/deployment/index.rst
diff --git a/docs/graphql/manual/deployment/logging.rst b/docs/graphql/core/deployment/logging.rst
similarity index 100%
rename from docs/graphql/manual/deployment/logging.rst
rename to docs/graphql/core/deployment/logging.rst
diff --git a/docs/graphql/manual/deployment/postgres-requirements.rst b/docs/graphql/core/deployment/postgres-requirements.rst
similarity index 100%
rename from docs/graphql/manual/deployment/postgres-requirements.rst
rename to docs/graphql/core/deployment/postgres-requirements.rst
diff --git a/docs/graphql/manual/deployment/production-checklist.rst b/docs/graphql/core/deployment/production-checklist.rst
similarity index 98%
rename from docs/graphql/manual/deployment/production-checklist.rst
rename to docs/graphql/core/deployment/production-checklist.rst
index 41cb5771cd85a..daabd5f67cac9 100644
--- a/docs/graphql/manual/deployment/production-checklist.rst
+++ b/docs/graphql/core/deployment/production-checklist.rst
@@ -49,7 +49,7 @@ Review the authorization/permission rules set on tables. You can make use of the
 permissions set across all tables and roles. Pay extra attention to roles like
 "anonymous" which allow unauthenticated access.
 
-.. thumbnail:: /img/graphql/manual/deployment/schema_permissions_summary.png
+.. thumbnail:: /img/graphql/core/deployment/schema_permissions_summary.png
    :alt: Hasura console - Schema permissions summary
    :width: 75%
 
diff --git a/docs/graphql/manual/deployment/securing-graphql-endpoint.rst b/docs/graphql/core/deployment/securing-graphql-endpoint.rst
similarity index 100%
rename from docs/graphql/manual/deployment/securing-graphql-endpoint.rst
rename to docs/graphql/core/deployment/securing-graphql-endpoint.rst
diff --git a/docs/graphql/manual/deployment/updating-graphql-engine.rst b/docs/graphql/core/deployment/updating-graphql-engine.rst
similarity index 100%
rename from docs/graphql/manual/deployment/updating-graphql-engine.rst
rename to docs/graphql/core/deployment/updating-graphql-engine.rst
diff --git a/docs/graphql/manual/event-triggers/clean-up.rst b/docs/graphql/core/event-triggers/clean-up.rst
similarity index 100%
rename from docs/graphql/manual/event-triggers/clean-up.rst
rename to docs/graphql/core/event-triggers/clean-up.rst
diff --git a/docs/graphql/manual/event-triggers/create-trigger.rst b/docs/graphql/core/event-triggers/create-trigger.rst
similarity index 94%
rename from docs/graphql/manual/event-triggers/create-trigger.rst
rename to docs/graphql/core/event-triggers/create-trigger.rst
index 6271c8343693f..7b561f1f4d5e9 100644
--- a/docs/graphql/manual/event-triggers/create-trigger.rst
+++ b/docs/graphql/core/event-triggers/create-trigger.rst
@@ -20,7 +20,7 @@ Event triggers can be created using the Hasura console or metadata APIs.
 Open the Hasura console, head to the ``Events`` tab and click on the ``Create`` button to open the
 page below:
 
-.. thumbnail:: /img/graphql/manual/event-triggers/create-event-trigger.png
+.. thumbnail:: /img/graphql/core/event-triggers/create-event-trigger.png
    :alt: Create an event trigger
 
 Parameters
@@ -52,7 +52,7 @@ before using it for this configuration*).
 Advanced Settings
 -----------------
 
-.. thumbnail:: /img/graphql/manual/event-triggers/create-event-trigger-advanced-settings.png
+.. thumbnail:: /img/graphql/core/event-triggers/create-event-trigger-advanced-settings.png
    :alt: Advanced settings for event triggers
 
 Listen columns for update
diff --git a/docs/graphql/manual/event-triggers/index.rst b/docs/graphql/core/event-triggers/index.rst
similarity index 93%
rename from docs/graphql/manual/event-triggers/index.rst
rename to docs/graphql/core/event-triggers/index.rst
index 338d8848dd867..15036fc77ef7d 100644
--- a/docs/graphql/manual/event-triggers/index.rst
+++ b/docs/graphql/core/event-triggers/index.rst
@@ -18,7 +18,7 @@ Introduction
 Hasura can be used to create event triggers on tables in the Postgres database. Event triggers reliably capture
 events on specified tables and invoke webhooks to carry out any custom logic.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/data-triggers-arch.png
+.. thumbnail:: /img/graphql/core/event-triggers/data-triggers-arch.png
    :class: no-shadow
    :width: 900px
    :alt: Hasura event trigger architecture
diff --git a/docs/graphql/manual/event-triggers/invoke-trigger-console.rst b/docs/graphql/core/event-triggers/invoke-trigger-console.rst
similarity index 87%
rename from docs/graphql/manual/event-triggers/invoke-trigger-console.rst
rename to docs/graphql/core/event-triggers/invoke-trigger-console.rst
index 0d371e708272d..3c352e5ac202d 100644
--- a/docs/graphql/manual/event-triggers/invoke-trigger-console.rst
+++ b/docs/graphql/core/event-triggers/invoke-trigger-console.rst
@@ -19,12 +19,12 @@ In the ``Data -> [table-name] -> Browse Rows`` tab, clicking the ``invoke trigge
 you invoke "manual event triggers" configured on the table with that row as payload *(the button will be shown
 only if you have any triggers configured)*:
 
-.. thumbnail:: /img/graphql/manual/event-triggers/select-manual-trigger.png
+.. thumbnail:: /img/graphql/core/event-triggers/select-manual-trigger.png
    :alt: Invoke event trigger on console
 
 Click on the event trigger you want to run and a modal will pop up with the request and response.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/run-manual-trigger.png
+.. thumbnail:: /img/graphql/core/event-triggers/run-manual-trigger.png
    :alt: Request and response of event trigger
 
 .. note::
diff --git a/docs/graphql/manual/event-triggers/payload.rst b/docs/graphql/core/event-triggers/payload.rst
similarity index 100%
rename from docs/graphql/manual/event-triggers/payload.rst
rename to docs/graphql/core/event-triggers/payload.rst
diff --git a/docs/graphql/manual/event-triggers/samples.rst b/docs/graphql/core/event-triggers/samples.rst
similarity index 100%
rename from docs/graphql/manual/event-triggers/samples.rst
rename to docs/graphql/core/event-triggers/samples.rst
diff --git a/docs/graphql/manual/event-triggers/serverless.rst b/docs/graphql/core/event-triggers/serverless.rst
similarity index 100%
rename from docs/graphql/manual/event-triggers/serverless.rst
rename to docs/graphql/core/event-triggers/serverless.rst
diff --git a/docs/graphql/manual/faq/index.rst.wip b/docs/graphql/core/faq/index.rst.wip
similarity index 100%
rename from docs/graphql/manual/faq/index.rst.wip
rename to docs/graphql/core/faq/index.rst.wip
diff --git a/docs/graphql/manual/getting-started/docker-simple.rst b/docs/graphql/core/getting-started/docker-simple.rst
similarity index 100%
rename from docs/graphql/manual/getting-started/docker-simple.rst
rename to docs/graphql/core/getting-started/docker-simple.rst
diff --git a/docs/graphql/manual/getting-started/first-event-trigger.rst b/docs/graphql/core/getting-started/first-event-trigger.rst
similarity index 88%
rename from docs/graphql/manual/getting-started/first-event-trigger.rst
rename to docs/graphql/core/getting-started/first-event-trigger.rst
index 40873f60a6e6c..ea82256094405 100644
--- a/docs/graphql/manual/getting-started/first-event-trigger.rst
+++ b/docs/graphql/core/getting-started/first-event-trigger.rst
@@ -32,7 +32,7 @@ the following columns:
     name TEXT
   )
 
-.. thumbnail:: /img/graphql/manual/getting-started/create-profile-table.png
+.. thumbnail:: /img/graphql/core/getting-started/create-profile-table.png
    :alt: Create a table
 
 Setup an event trigger
@@ -45,7 +45,7 @@ In the Hasura console, navigate to ``Events -> Create trigger`` and:
 3. Select operations: ``insert``, ``update`` and ``delete``.
 4. Enter webhook URL as: ``https://httpbin.org/post``.
 
-.. thumbnail:: /img/graphql/manual/getting-started/create-event-trigger.png
+.. thumbnail:: /img/graphql/core/getting-started/create-event-trigger.png
    :alt: Set up an event trigger
 
 This sets up our webhook ``https://httpbin.org/post`` to receive database changes on an insert, update and delete on
@@ -59,7 +59,7 @@ Watch the trigger in action
 2. Now navigate to the ``Events`` tab and click on the ``echo`` trigger in the left sidebar.
 3. Expand the details of an event to see the response from the webhook.
 
-.. thumbnail:: /img/graphql/manual/getting-started/trigger-events.png
+.. thumbnail:: /img/graphql/core/getting-started/trigger-events.png
    :alt: Trigger in action
 
 Next steps
diff --git a/docs/graphql/manual/getting-started/first-graphql-query.rst b/docs/graphql/core/getting-started/first-graphql-query.rst
similarity index 89%
rename from docs/graphql/manual/getting-started/first-graphql-query.rst
rename to docs/graphql/core/getting-started/first-graphql-query.rst
index e133188b27678..e79919de707f5 100644
--- a/docs/graphql/manual/getting-started/first-graphql-query.rst
+++ b/docs/graphql/core/getting-started/first-graphql-query.rst
@@ -30,7 +30,7 @@ the following columns:
     name TEXT
   )
 
-.. thumbnail:: /img/graphql/manual/getting-started/create-profile-table.png
+.. thumbnail:: /img/graphql/core/getting-started/create-profile-table.png
    :alt: Create a table
 
 Now, insert some sample data into the table using the ``Insert Row`` tab of the ``profile`` table.
@@ -51,7 +51,7 @@ Head to the ``GraphiQL`` tab in the console and try running the following query:
 
 You'll see that you get all the inserted data!
 
-.. thumbnail:: /img/graphql/manual/getting-started/profile-query.png
+.. thumbnail:: /img/graphql/core/getting-started/profile-query.png
    :alt: Try out a query
 
 Next steps
diff --git a/docs/graphql/manual/getting-started/index.rst b/docs/graphql/core/getting-started/index.rst
similarity index 94%
rename from docs/graphql/manual/getting-started/index.rst
rename to docs/graphql/core/getting-started/index.rst
index 2248a165c764c..0322fa37132c7 100644
--- a/docs/graphql/manual/getting-started/index.rst
+++ b/docs/graphql/core/getting-started/index.rst
@@ -47,7 +47,7 @@ Get started using an existing database
    :titlesonly:
    :hidden:
 
-   Hasura Cloud quickstart <https://hasura.io/docs/1.0/cloud/getting-started/index.html>
+   Hasura Cloud quickstart <https://hasura.io/docs/1.0/graphql/cloud/getting-started/index.html>
    Docker quickstart <docker-simple>
    Using an existing database <using-existing-database>
    first-graphql-query
diff --git a/docs/graphql/manual/getting-started/using-existing-database.rst b/docs/graphql/core/getting-started/using-existing-database.rst
similarity index 100%
rename from docs/graphql/manual/getting-started/using-existing-database.rst
rename to docs/graphql/core/getting-started/using-existing-database.rst
diff --git a/docs/graphql/manual/guides/auditing-tables.rst b/docs/graphql/core/guides/auditing-tables.rst
similarity index 100%
rename from docs/graphql/manual/guides/auditing-tables.rst
rename to docs/graphql/core/guides/auditing-tables.rst
diff --git a/docs/graphql/manual/guides/code-editor-integrations/index.rst b/docs/graphql/core/guides/code-editor-integrations/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/code-editor-integrations/index.rst
rename to docs/graphql/core/guides/code-editor-integrations/index.rst
diff --git a/docs/graphql/manual/guides/code-editor-integrations/visual-studio-code.rst b/docs/graphql/core/guides/code-editor-integrations/visual-studio-code.rst
similarity index 100%
rename from docs/graphql/manual/guides/code-editor-integrations/visual-studio-code.rst
rename to docs/graphql/core/guides/code-editor-integrations/visual-studio-code.rst
diff --git a/docs/graphql/manual/guides/data-modelling/index.rst b/docs/graphql/core/guides/data-modelling/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/data-modelling/index.rst
rename to docs/graphql/core/guides/data-modelling/index.rst
diff --git a/docs/graphql/manual/guides/data-modelling/soft-deletes.rst b/docs/graphql/core/guides/data-modelling/soft-deletes.rst
similarity index 91%
rename from docs/graphql/manual/guides/data-modelling/soft-deletes.rst
rename to docs/graphql/core/guides/data-modelling/soft-deletes.rst
index 65c4f2a1576d4..5b659d3c9b2b6 100644
--- a/docs/graphql/manual/guides/data-modelling/soft-deletes.rst
+++ b/docs/graphql/core/guides/data-modelling/soft-deletes.rst
@@ -24,7 +24,7 @@ there is a timestamp value present, the record should be treated as deleted.
 **For example:** Let's imagine that we have a simple Todo application, our ``todos`` table would resemble
 the following:
 
-.. thumbnail:: /img/graphql/manual/guides/soft-deletes-example-data.png
+.. thumbnail:: /img/graphql/core/guides/soft-deletes-example-data.png
    :alt: Todo table of a todo application
 
 In this example we only have two todos, one has ``deleted_at`` with a timestamp value and the other contains a
@@ -79,17 +79,17 @@ Here are some typical rules we should set:
 
 **Delete permissions** - remove all access
 
-.. thumbnail:: /img/graphql/manual/guides/soft-deletes-delete-perms.png
+.. thumbnail:: /img/graphql/core/guides/soft-deletes-delete-perms.png
    :alt: Delete permissions for role user
 
 **Insert permissions** - remove access for inserting into ``deleted_at`` column
 
-.. thumbnail:: /img/graphql/manual/guides/soft-deletes-insert-perms.png
+.. thumbnail:: /img/graphql/core/guides/soft-deletes-insert-perms.png
    :alt: Insert permissions for role user
 
 **Update permissions** - allow access for updating ``deleted_at`` column
 
-.. thumbnail:: /img/graphql/manual/guides/soft-deletes-update-perms.png
+.. thumbnail:: /img/graphql/core/guides/soft-deletes-update-perms.png
    :alt: Update permissions for role user
 
 Step 4: Restrict access to soft-deleted records
@@ -103,7 +103,7 @@ access to the ``todos`` table.
 For example, let's say that a role ``user`` can only access non-deleted todos, we need to add the following
 permission rule to ensure this:
 
-.. thumbnail:: /img/graphql/manual/guides/soft-deletes-select-perms.png
+.. thumbnail:: /img/graphql/core/guides/soft-deletes-select-perms.png
    :alt: Restrict access to soft-deleted records
 
 Now the role ``user`` can only access non-deleted ``todos``:
diff --git a/docs/graphql/manual/guides/docker-networking.rst b/docs/graphql/core/guides/docker-networking.rst
similarity index 100%
rename from docs/graphql/manual/guides/docker-networking.rst
rename to docs/graphql/core/guides/docker-networking.rst
diff --git a/docs/graphql/manual/guides/index.rst b/docs/graphql/core/guides/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/index.rst
rename to docs/graphql/core/guides/index.rst
diff --git a/docs/graphql/manual/guides/integrations/apollo-subscriptions.rst b/docs/graphql/core/guides/integrations/apollo-subscriptions.rst
similarity index 100%
rename from docs/graphql/manual/guides/integrations/apollo-subscriptions.rst
rename to docs/graphql/core/guides/integrations/apollo-subscriptions.rst
diff --git a/docs/graphql/manual/guides/integrations/auth-guardian-jwt.rst b/docs/graphql/core/guides/integrations/auth-guardian-jwt.rst
similarity index 93%
rename from docs/graphql/manual/guides/integrations/auth-guardian-jwt.rst
rename to docs/graphql/core/guides/integrations/auth-guardian-jwt.rst
index 6920b9f73ccab..44d1669d5e70b 100644
--- a/docs/graphql/manual/guides/integrations/auth-guardian-jwt.rst
+++ b/docs/graphql/core/guides/integrations/auth-guardian-jwt.rst
@@ -64,7 +64,7 @@ Let's say you're using GitHub as the primary login for your Hasura app, and that
 - Add set the user id in the "built-in value" field to ``GITHUB_USER_ID``
 - Click the ``save`` button on the right hand side.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-user-id.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-user-id.png
    :alt: Set an AuthGuardian JWT with a user id
 
 Option 2: Set the default Hasura role
@@ -78,7 +78,7 @@ Add a new rule (the ``+`` button in the top-left), and fill it out:
 - Add the default role, e.g. ``user``.
 - Click the ``save`` button on the right hand side.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-default-role.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-default-role.png
    :alt: Set an AuthGuardian JWT with default role
 
 .. note::
@@ -94,7 +94,7 @@ Now, you want to restrict access to some data in Hasura so that only you and you
 - Click on "Add" and add an additional role, e.g. ``admin``.
 - Click the ``save`` button on the right hand side.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-additional-role.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-additional-role.png
    :alt: Set an AuthGuardian JWT with additional roles
 
 Option 4: Set a session variable
@@ -108,7 +108,7 @@ Let's say we want to restrict access to some super-interesting data in our Hasur
 - Add your session variable name ``is-our-biggest-fan`` and value to JSON ``true``.
 - Click the ``save`` button on the right hand side.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-session-variable.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-session-variable.png
    :alt: Set an AuthGuardian JWT with session variables for Hasura to use
 
 .. note::
@@ -143,7 +143,7 @@ The generated config has the following structure:
 
 - Add the generated config as a value for the environment variable ``HASURA_GRAPHQL_JWT_SECRET`` or for the ``--jwt-secret`` server flag.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-config-generator.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-config-generator.png
    :alt: AuthGuardian lets you copy/paste the required JWT configuration for either Hasura or Hasura-on-Heroku
 
 Step 4: Test the config and tokens
@@ -155,12 +155,12 @@ When configuring your permissions in Hasura, it's useful to be able to quickly g
 - Paste the copied JWT (or optionally write your own JSON if you want to test alternative scenarios).
 - Copy the signed token and add it as a header in the Hasura console.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-generate-test-jwt.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-generate-test-jwt.png
    :alt: Use the JWT-signer form to quickly sign any JSON and test in the Hasura console
 
 - In GraphiQL, try out queries to test that the integration works as expected by adding an ``Authorization`` header, with a value of ``Bearer <the-copied-JWT-text>``. Hasura's GraphiQL will recognize this header, show you its content, and confirm whether it recognizes the JWT as securely signed.
 
-.. thumbnail:: /img/graphql/manual/guides/auth-guardian-test-jwt.png
+.. thumbnail:: /img/graphql/core/guides/auth-guardian-test-jwt.png
    :alt: Test AuthGuardian JWT
 
 Next Steps
diff --git a/docs/graphql/manual/guides/integrations/auth0-jwt.rst b/docs/graphql/core/guides/integrations/auth0-jwt.rst
similarity index 98%
rename from docs/graphql/manual/guides/integrations/auth0-jwt.rst
rename to docs/graphql/core/guides/integrations/auth0-jwt.rst
index f6e4e4f45593d..5fb61e1852cdf 100644
--- a/docs/graphql/manual/guides/integrations/auth0-jwt.rst
+++ b/docs/graphql/core/guides/integrations/auth0-jwt.rst
@@ -25,7 +25,7 @@ Create an Auth0 Application
 - In the ``Create Application`` window, set a name for your application and select ``Single Page Web Applications``
   (assuming your application is React/Angular/Vue etc).
 
-.. thumbnail:: /img/graphql/manual/guides/create-client-popup.png
+.. thumbnail:: /img/graphql/core/guides/create-client-popup.png
    :alt: Create an Auth0 application
 
 Configure Auth0 Rules & Callback URLs
@@ -192,7 +192,7 @@ The generated config can be used in env ``HASURA_GRAPHQL_JWT_SECRET`` or ``--jwt
 The config generated from this page can be directly pasted in ``yaml`` files and command line arguments as it takes care of
 escaping new lines.
 
-.. thumbnail:: /img/graphql/manual/auth/jwt-config-generated.png
+.. thumbnail:: /img/graphql/core/auth/jwt-config-generated.png
    :width: 75%
    :alt: Generated JWT config
 
diff --git a/docs/graphql/manual/guides/integrations/aws-cognito.rst b/docs/graphql/core/guides/integrations/aws-cognito.rst
similarity index 93%
rename from docs/graphql/manual/guides/integrations/aws-cognito.rst
rename to docs/graphql/core/guides/integrations/aws-cognito.rst
index fde890cf98885..0a6540160b12b 100644
--- a/docs/graphql/manual/guides/integrations/aws-cognito.rst
+++ b/docs/graphql/core/guides/integrations/aws-cognito.rst
@@ -23,7 +23,7 @@ Set up user pools and hosted web UI
 Follow `these instructions <https://docs.aws.amazon.com/cognito/latest/developerguide/getting-started-with-cognito-user-pools.html>`__ 
 to set up a user pool, add an app and enable the hosted web UI in AWS cognito. While enabling the hosted web UI, you need to select the checkbox ``Implicit Grant``.
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-app-client-settings.png
+.. thumbnail:: /img/graphql/core/guides/cognito-app-client-settings.png
    :alt: Cognito App Client Settings
 
 
@@ -53,7 +53,7 @@ To add custom claims to the JWT, we need to create a lambda function and configu
         callback(null, event)
     }
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-lambda.png
+.. thumbnail:: /img/graphql/core/guides/cognito-lambda.png
    :alt: Cognito Lambda function to add claims to the JWT
 
 Configure Cognito to trigger the lambda function
@@ -61,11 +61,11 @@ Configure Cognito to trigger the lambda function
 
 In cognito, select ``Triggers`` -> ``Pre Token Generation`` and choose the lambda function created above:
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-triggers-1.png
+.. thumbnail:: /img/graphql/core/guides/cognito-triggers-1.png
    :alt: Select lambda for the trigger
 
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-triggers-2.png
+.. thumbnail:: /img/graphql/core/guides/cognito-triggers-2.png
    :alt: Select lambda for the trigger
 
 
@@ -76,13 +76,13 @@ You don't need to integrate your UI with Cognito for testing. You can follow the
 
 1. Launch the hosted UI from AWS Cognito.
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-launch-hosted-ui.png
+.. thumbnail:: /img/graphql/core/guides/cognito-launch-hosted-ui.png
    :alt: Launch Cognito Login UI
 
 
 2. You should see the Cognito login page where you can log in or sign up.
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-login.png
+.. thumbnail:: /img/graphql/core/guides/cognito-login.png
    :alt: Cognito Login Page
 
 .. _test-cognito:
@@ -90,13 +90,13 @@ You don't need to integrate your UI with Cognito for testing. You can follow the
 3. After successfully logging in, you will be redirected to ``https://localhost:3000/cognito-callback#id_token=xxxxxx&yyyyyy``.
 This page may be a 404 if you don't have a UI running on localhost:3000. Extract the ``id_token`` value from this URL.
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-redirect.png
+.. thumbnail:: /img/graphql/core/guides/cognito-redirect.png
    :alt: JWT from id_token query param
 
 
 4. To test this JWT, and to see if all the Hasura claims are added as per the sections above, let's test this out with `jwt.io <https://jwt.io>`__!
 
-.. thumbnail:: /img/graphql/manual/guides/cognito-jwt.png
+.. thumbnail:: /img/graphql/core/guides/cognito-jwt.png
    :alt: JWT debug on jwt.io
 
 **Save this JWT token value so that we can use it later to test the authorization using the Hasura console.**
diff --git a/docs/graphql/manual/guides/integrations/index.rst b/docs/graphql/core/guides/integrations/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/integrations/index.rst
rename to docs/graphql/core/guides/integrations/index.rst
diff --git a/docs/graphql/manual/guides/monitoring/index.rst b/docs/graphql/core/guides/monitoring/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/monitoring/index.rst
rename to docs/graphql/core/guides/monitoring/index.rst
diff --git a/docs/graphql/manual/guides/sample-apps/index.rst b/docs/graphql/core/guides/sample-apps/index.rst
similarity index 100%
rename from docs/graphql/manual/guides/sample-apps/index.rst
rename to docs/graphql/core/guides/sample-apps/index.rst
diff --git a/docs/graphql/manual/guides/telemetry.rst b/docs/graphql/core/guides/telemetry.rst
similarity index 100%
rename from docs/graphql/manual/guides/telemetry.rst
rename to docs/graphql/core/guides/telemetry.rst
diff --git a/docs/graphql/manual/hasura-cli/config-reference.rst b/docs/graphql/core/hasura-cli/config-reference.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/config-reference.rst
rename to docs/graphql/core/hasura-cli/config-reference.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura.rst b/docs/graphql/core/hasura-cli/hasura.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura.rst
rename to docs/graphql/core/hasura-cli/hasura.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_actions.rst b/docs/graphql/core/hasura-cli/hasura_actions.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_actions.rst
rename to docs/graphql/core/hasura-cli/hasura_actions.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_actions_codegen.rst b/docs/graphql/core/hasura-cli/hasura_actions_codegen.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_actions_codegen.rst
rename to docs/graphql/core/hasura-cli/hasura_actions_codegen.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_actions_create.rst b/docs/graphql/core/hasura-cli/hasura_actions_create.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_actions_create.rst
rename to docs/graphql/core/hasura-cli/hasura_actions_create.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_actions_use-codegen.rst b/docs/graphql/core/hasura-cli/hasura_actions_use-codegen.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_actions_use-codegen.rst
rename to docs/graphql/core/hasura-cli/hasura_actions_use-codegen.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_completion.rst b/docs/graphql/core/hasura-cli/hasura_completion.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_completion.rst
rename to docs/graphql/core/hasura-cli/hasura_completion.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_console.rst b/docs/graphql/core/hasura-cli/hasura_console.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_console.rst
rename to docs/graphql/core/hasura-cli/hasura_console.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_init.rst b/docs/graphql/core/hasura-cli/hasura_init.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_init.rst
rename to docs/graphql/core/hasura-cli/hasura_init.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata.rst b/docs/graphql/core/hasura-cli/hasura_metadata.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_apply.rst b/docs/graphql/core/hasura-cli/hasura_metadata_apply.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_apply.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_apply.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_clear.rst b/docs/graphql/core/hasura-cli/hasura_metadata_clear.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_clear.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_clear.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_diff.rst b/docs/graphql/core/hasura-cli/hasura_metadata_diff.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_diff.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_diff.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_export.rst b/docs/graphql/core/hasura-cli/hasura_metadata_export.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_export.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_export.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency.rst b/docs/graphql/core/hasura-cli/hasura_metadata_inconsistency.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_inconsistency.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_drop.rst b/docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_drop.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_drop.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_drop.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_list.rst b/docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_list.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_list.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_list.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_status.rst b/docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_status.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_inconsistency_status.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_inconsistency_status.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_metadata_reload.rst b/docs/graphql/core/hasura-cli/hasura_metadata_reload.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_metadata_reload.rst
rename to docs/graphql/core/hasura-cli/hasura_metadata_reload.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_migrate.rst b/docs/graphql/core/hasura-cli/hasura_migrate.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_migrate.rst
rename to docs/graphql/core/hasura-cli/hasura_migrate.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_migrate_apply.rst b/docs/graphql/core/hasura-cli/hasura_migrate_apply.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_migrate_apply.rst
rename to docs/graphql/core/hasura-cli/hasura_migrate_apply.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_migrate_create.rst b/docs/graphql/core/hasura-cli/hasura_migrate_create.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_migrate_create.rst
rename to docs/graphql/core/hasura-cli/hasura_migrate_create.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_migrate_squash.rst b/docs/graphql/core/hasura-cli/hasura_migrate_squash.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_migrate_squash.rst
rename to docs/graphql/core/hasura-cli/hasura_migrate_squash.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_migrate_status.rst b/docs/graphql/core/hasura-cli/hasura_migrate_status.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_migrate_status.rst
rename to docs/graphql/core/hasura-cli/hasura_migrate_status.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_plugins.rst b/docs/graphql/core/hasura-cli/hasura_plugins.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_plugins.rst
rename to docs/graphql/core/hasura-cli/hasura_plugins.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_plugins_install.rst b/docs/graphql/core/hasura-cli/hasura_plugins_install.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_plugins_install.rst
rename to docs/graphql/core/hasura-cli/hasura_plugins_install.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_plugins_list.rst b/docs/graphql/core/hasura-cli/hasura_plugins_list.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_plugins_list.rst
rename to docs/graphql/core/hasura-cli/hasura_plugins_list.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_plugins_uninstall.rst b/docs/graphql/core/hasura-cli/hasura_plugins_uninstall.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_plugins_uninstall.rst
rename to docs/graphql/core/hasura-cli/hasura_plugins_uninstall.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_plugins_upgrade.rst b/docs/graphql/core/hasura-cli/hasura_plugins_upgrade.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_plugins_upgrade.rst
rename to docs/graphql/core/hasura-cli/hasura_plugins_upgrade.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_scripts.rst b/docs/graphql/core/hasura-cli/hasura_scripts.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_scripts.rst
rename to docs/graphql/core/hasura-cli/hasura_scripts.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_scripts_update-project-v2.rst b/docs/graphql/core/hasura-cli/hasura_scripts_update-project-v2.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_scripts_update-project-v2.rst
rename to docs/graphql/core/hasura-cli/hasura_scripts_update-project-v2.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_seeds.rst b/docs/graphql/core/hasura-cli/hasura_seeds.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_seeds.rst
rename to docs/graphql/core/hasura-cli/hasura_seeds.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_seeds_apply.rst b/docs/graphql/core/hasura-cli/hasura_seeds_apply.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_seeds_apply.rst
rename to docs/graphql/core/hasura-cli/hasura_seeds_apply.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_seeds_create.rst b/docs/graphql/core/hasura-cli/hasura_seeds_create.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_seeds_create.rst
rename to docs/graphql/core/hasura-cli/hasura_seeds_create.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_update-cli.rst b/docs/graphql/core/hasura-cli/hasura_update-cli.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_update-cli.rst
rename to docs/graphql/core/hasura-cli/hasura_update-cli.rst
diff --git a/docs/graphql/manual/hasura-cli/hasura_version.rst b/docs/graphql/core/hasura-cli/hasura_version.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/hasura_version.rst
rename to docs/graphql/core/hasura-cli/hasura_version.rst
diff --git a/docs/graphql/manual/hasura-cli/index.rst b/docs/graphql/core/hasura-cli/index.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/index.rst
rename to docs/graphql/core/hasura-cli/index.rst
diff --git a/docs/graphql/manual/hasura-cli/install-hasura-cli.rst b/docs/graphql/core/hasura-cli/install-hasura-cli.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/install-hasura-cli.rst
rename to docs/graphql/core/hasura-cli/install-hasura-cli.rst
diff --git a/docs/graphql/manual/hasura-cli/uninstall-hasura-cli.rst b/docs/graphql/core/hasura-cli/uninstall-hasura-cli.rst
similarity index 100%
rename from docs/graphql/manual/hasura-cli/uninstall-hasura-cli.rst
rename to docs/graphql/core/hasura-cli/uninstall-hasura-cli.rst
diff --git a/docs/graphql/manual/how-it-works/index.rst b/docs/graphql/core/how-it-works/index.rst
similarity index 100%
rename from docs/graphql/manual/how-it-works/index.rst
rename to docs/graphql/core/how-it-works/index.rst
diff --git a/docs/graphql/manual/how-it-works/metadata-schema.rst b/docs/graphql/core/how-it-works/metadata-schema.rst
similarity index 98%
rename from docs/graphql/manual/how-it-works/metadata-schema.rst
rename to docs/graphql/core/how-it-works/metadata-schema.rst
index 1459139f3b55a..4527553b5f6c3 100644
--- a/docs/graphql/manual/how-it-works/metadata-schema.rst
+++ b/docs/graphql/core/how-it-works/metadata-schema.rst
@@ -40,7 +40,7 @@ the metadata API.
 Schema
 """"""
 
-.. thumbnail:: /img/graphql/manual/engine-internals/hdb_table.jpg
+.. thumbnail:: /img/graphql/core/engine-internals/hdb_table.jpg
   :width: 30%
   :alt: hdb_table schema
 
@@ -66,7 +66,7 @@ the metadata API.
 Schema
 """"""
 
-.. thumbnail:: /img/graphql/manual/engine-internals/hdb_relationship.jpg
+.. thumbnail:: /img/graphql/core/engine-internals/hdb_relationship.jpg
   :width: 30%
   :alt: hdb_relationship schema
 
@@ -110,7 +110,7 @@ the metadata API.
 Schema
 """"""
 
-.. thumbnail:: /img/graphql/manual/engine-internals/hdb_permission.jpg
+.. thumbnail:: /img/graphql/core/engine-internals/hdb_permission.jpg
   :width: 30%
   :alt: hdb_permission schema
 
diff --git a/docs/graphql/manual/index.rst b/docs/graphql/core/index.rst
similarity index 100%
rename from docs/graphql/manual/index.rst
rename to docs/graphql/core/index.rst
diff --git a/docs/graphql/manual/integration/index.rst.wip b/docs/graphql/core/integration/index.rst.wip
similarity index 100%
rename from docs/graphql/manual/integration/index.rst.wip
rename to docs/graphql/core/integration/index.rst.wip
diff --git a/docs/graphql/manual/introduction/index.rst.wip b/docs/graphql/core/introduction/index.rst.wip
similarity index 100%
rename from docs/graphql/manual/introduction/index.rst.wip
rename to docs/graphql/core/introduction/index.rst.wip
diff --git a/docs/graphql/manual/migrations/advanced/auto-apply-migrations.rst b/docs/graphql/core/migrations/advanced/auto-apply-migrations.rst
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/auto-apply-migrations.rst
rename to docs/graphql/core/migrations/advanced/auto-apply-migrations.rst
diff --git a/docs/graphql/manual/migrations/advanced/collaboration.rst.wip b/docs/graphql/core/migrations/advanced/collaboration.rst.wip
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/collaboration.rst.wip
rename to docs/graphql/core/migrations/advanced/collaboration.rst.wip
diff --git a/docs/graphql/manual/migrations/advanced/index.rst b/docs/graphql/core/migrations/advanced/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/index.rst
rename to docs/graphql/core/migrations/advanced/index.rst
diff --git a/docs/graphql/manual/migrations/advanced/rolling-back-migrations.rst b/docs/graphql/core/migrations/advanced/rolling-back-migrations.rst
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/rolling-back-migrations.rst
rename to docs/graphql/core/migrations/advanced/rolling-back-migrations.rst
diff --git a/docs/graphql/manual/migrations/advanced/seed-data-migration.rst b/docs/graphql/core/migrations/advanced/seed-data-migration.rst
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/seed-data-migration.rst
rename to docs/graphql/core/migrations/advanced/seed-data-migration.rst
diff --git a/docs/graphql/manual/migrations/advanced/writing-migrations-manually.rst b/docs/graphql/core/migrations/advanced/writing-migrations-manually.rst
similarity index 100%
rename from docs/graphql/manual/migrations/advanced/writing-migrations-manually.rst
rename to docs/graphql/core/migrations/advanced/writing-migrations-manually.rst
diff --git a/docs/graphql/manual/migrations/basics.rst b/docs/graphql/core/migrations/basics.rst
similarity index 100%
rename from docs/graphql/manual/migrations/basics.rst
rename to docs/graphql/core/migrations/basics.rst
diff --git a/docs/graphql/manual/migrations/config-v1/advanced/auto-apply-migrations.rst b/docs/graphql/core/migrations/config-v1/advanced/auto-apply-migrations.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/advanced/auto-apply-migrations.rst
rename to docs/graphql/core/migrations/config-v1/advanced/auto-apply-migrations.rst
diff --git a/docs/graphql/manual/migrations/config-v1/advanced/index.rst b/docs/graphql/core/migrations/config-v1/advanced/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/advanced/index.rst
rename to docs/graphql/core/migrations/config-v1/advanced/index.rst
diff --git a/docs/graphql/manual/migrations/config-v1/advanced/rolling-back-migrations.rst b/docs/graphql/core/migrations/config-v1/advanced/rolling-back-migrations.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/advanced/rolling-back-migrations.rst
rename to docs/graphql/core/migrations/config-v1/advanced/rolling-back-migrations.rst
diff --git a/docs/graphql/manual/migrations/config-v1/advanced/writing-migrations-manually.rst b/docs/graphql/core/migrations/config-v1/advanced/writing-migrations-manually.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/advanced/writing-migrations-manually.rst
rename to docs/graphql/core/migrations/config-v1/advanced/writing-migrations-manually.rst
diff --git a/docs/graphql/manual/migrations/config-v1/index.rst b/docs/graphql/core/migrations/config-v1/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/index.rst
rename to docs/graphql/core/migrations/config-v1/index.rst
diff --git a/docs/graphql/manual/migrations/config-v1/manage-metadata.rst b/docs/graphql/core/migrations/config-v1/manage-metadata.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/manage-metadata.rst
rename to docs/graphql/core/migrations/config-v1/manage-metadata.rst
diff --git a/docs/graphql/manual/migrations/config-v1/manage-migrations.rst b/docs/graphql/core/migrations/config-v1/manage-migrations.rst
similarity index 99%
rename from docs/graphql/manual/migrations/config-v1/manage-migrations.rst
rename to docs/graphql/core/migrations/config-v1/manage-migrations.rst
index 18fce6dc74e90..4d694e34bd30b 100644
--- a/docs/graphql/manual/migrations/config-v1/manage-migrations.rst
+++ b/docs/graphql/core/migrations/config-v1/manage-migrations.rst
@@ -182,7 +182,7 @@ mounted into a directory.
 
 If you now open the console of the new instance, you can see that the three tables have been created and are tracked:
 
-.. thumbnail:: /img/graphql/manual/migrations/tracked-tables.png
+.. thumbnail:: /img/graphql/core/migrations/tracked-tables.png
    :alt: Tracked tables from Hasura migrations
    :width: 30%
 
diff --git a/docs/graphql/manual/migrations/config-v1/reference/index.rst b/docs/graphql/core/migrations/config-v1/reference/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/reference/index.rst
rename to docs/graphql/core/migrations/config-v1/reference/index.rst
diff --git a/docs/graphql/manual/migrations/config-v1/reference/metadata-file-format.rst b/docs/graphql/core/migrations/config-v1/reference/metadata-file-format.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/reference/metadata-file-format.rst
rename to docs/graphql/core/migrations/config-v1/reference/metadata-file-format.rst
diff --git a/docs/graphql/manual/migrations/config-v1/reference/migration-file-format.rst b/docs/graphql/core/migrations/config-v1/reference/migration-file-format.rst
similarity index 100%
rename from docs/graphql/manual/migrations/config-v1/reference/migration-file-format.rst
rename to docs/graphql/core/migrations/config-v1/reference/migration-file-format.rst
diff --git a/docs/graphql/manual/migrations/index.rst b/docs/graphql/core/migrations/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/index.rst
rename to docs/graphql/core/migrations/index.rst
diff --git a/docs/graphql/manual/migrations/manage-metadata.rst b/docs/graphql/core/migrations/manage-metadata.rst
similarity index 100%
rename from docs/graphql/manual/migrations/manage-metadata.rst
rename to docs/graphql/core/migrations/manage-metadata.rst
diff --git a/docs/graphql/manual/migrations/migrations-setup.rst b/docs/graphql/core/migrations/migrations-setup.rst
similarity index 99%
rename from docs/graphql/manual/migrations/migrations-setup.rst
rename to docs/graphql/core/migrations/migrations-setup.rst
index 4253a3ea38037..2835bda89a11f 100644
--- a/docs/graphql/manual/migrations/migrations-setup.rst
+++ b/docs/graphql/core/migrations/migrations-setup.rst
@@ -267,7 +267,7 @@ mounted onto directories.
 If you now open the console of the new instance, you can see that the three tables have
 been created and are tracked:
 
-.. thumbnail:: /img/graphql/manual/migrations/tracked-tables.png
+.. thumbnail:: /img/graphql/core/migrations/tracked-tables.png
    :alt: Tracked tables from Hasura migrations
    :width: 30%
 
diff --git a/docs/graphql/manual/migrations/reference/how-it-works.rst b/docs/graphql/core/migrations/reference/how-it-works.rst
similarity index 100%
rename from docs/graphql/manual/migrations/reference/how-it-works.rst
rename to docs/graphql/core/migrations/reference/how-it-works.rst
diff --git a/docs/graphql/manual/migrations/reference/index.rst b/docs/graphql/core/migrations/reference/index.rst
similarity index 100%
rename from docs/graphql/manual/migrations/reference/index.rst
rename to docs/graphql/core/migrations/reference/index.rst
diff --git a/docs/graphql/manual/migrations/reference/metadata-format.rst b/docs/graphql/core/migrations/reference/metadata-format.rst
similarity index 100%
rename from docs/graphql/manual/migrations/reference/metadata-format.rst
rename to docs/graphql/core/migrations/reference/metadata-format.rst
diff --git a/docs/graphql/manual/migrations/reference/migration-file-format.rst b/docs/graphql/core/migrations/reference/migration-file-format.rst
similarity index 100%
rename from docs/graphql/manual/migrations/reference/migration-file-format.rst
rename to docs/graphql/core/migrations/reference/migration-file-format.rst
diff --git a/docs/graphql/manual/migrations/upgrade-v2.rst b/docs/graphql/core/migrations/upgrade-v2.rst
similarity index 100%
rename from docs/graphql/manual/migrations/upgrade-v2.rst
rename to docs/graphql/core/migrations/upgrade-v2.rst
diff --git a/docs/graphql/manual/mutations/delete.rst b/docs/graphql/core/mutations/delete.rst
similarity index 100%
rename from docs/graphql/manual/mutations/delete.rst
rename to docs/graphql/core/mutations/delete.rst
diff --git a/docs/graphql/manual/mutations/index.rst b/docs/graphql/core/mutations/index.rst
similarity index 100%
rename from docs/graphql/manual/mutations/index.rst
rename to docs/graphql/core/mutations/index.rst
diff --git a/docs/graphql/manual/mutations/insert.rst b/docs/graphql/core/mutations/insert.rst
similarity index 100%
rename from docs/graphql/manual/mutations/insert.rst
rename to docs/graphql/core/mutations/insert.rst
diff --git a/docs/graphql/manual/mutations/multiple-mutations.rst b/docs/graphql/core/mutations/multiple-mutations.rst
similarity index 100%
rename from docs/graphql/manual/mutations/multiple-mutations.rst
rename to docs/graphql/core/mutations/multiple-mutations.rst
diff --git a/docs/graphql/manual/mutations/update.rst b/docs/graphql/core/mutations/update.rst
similarity index 100%
rename from docs/graphql/manual/mutations/update.rst
rename to docs/graphql/core/mutations/update.rst
diff --git a/docs/graphql/manual/mutations/upsert.rst b/docs/graphql/core/mutations/upsert.rst
similarity index 100%
rename from docs/graphql/manual/mutations/upsert.rst
rename to docs/graphql/core/mutations/upsert.rst
diff --git a/docs/graphql/manual/performance/index.rst.wip b/docs/graphql/core/performance/index.rst.wip
similarity index 100%
rename from docs/graphql/manual/performance/index.rst.wip
rename to docs/graphql/core/performance/index.rst.wip
diff --git a/docs/graphql/manual/queries/aggregation-queries.rst b/docs/graphql/core/queries/aggregation-queries.rst
similarity index 100%
rename from docs/graphql/manual/queries/aggregation-queries.rst
rename to docs/graphql/core/queries/aggregation-queries.rst
diff --git a/docs/graphql/manual/queries/distinct-queries.rst b/docs/graphql/core/queries/distinct-queries.rst
similarity index 100%
rename from docs/graphql/manual/queries/distinct-queries.rst
rename to docs/graphql/core/queries/distinct-queries.rst
diff --git a/docs/graphql/manual/queries/index.rst b/docs/graphql/core/queries/index.rst
similarity index 100%
rename from docs/graphql/manual/queries/index.rst
rename to docs/graphql/core/queries/index.rst
diff --git a/docs/graphql/manual/queries/multiple-arguments.rst b/docs/graphql/core/queries/multiple-arguments.rst
similarity index 100%
rename from docs/graphql/manual/queries/multiple-arguments.rst
rename to docs/graphql/core/queries/multiple-arguments.rst
diff --git a/docs/graphql/manual/queries/multiple-queries.rst b/docs/graphql/core/queries/multiple-queries.rst
similarity index 100%
rename from docs/graphql/manual/queries/multiple-queries.rst
rename to docs/graphql/core/queries/multiple-queries.rst
diff --git a/docs/graphql/manual/queries/nested-object-queries.rst b/docs/graphql/core/queries/nested-object-queries.rst
similarity index 100%
rename from docs/graphql/manual/queries/nested-object-queries.rst
rename to docs/graphql/core/queries/nested-object-queries.rst
diff --git a/docs/graphql/manual/queries/pagination.rst b/docs/graphql/core/queries/pagination.rst
similarity index 100%
rename from docs/graphql/manual/queries/pagination.rst
rename to docs/graphql/core/queries/pagination.rst
diff --git a/docs/graphql/manual/queries/performance.rst b/docs/graphql/core/queries/performance.rst
similarity index 97%
rename from docs/graphql/manual/queries/performance.rst
rename to docs/graphql/core/queries/performance.rst
index dbcc924f739e1..21d0b25851745 100644
--- a/docs/graphql/manual/queries/performance.rst
+++ b/docs/graphql/core/queries/performance.rst
@@ -36,14 +36,14 @@ Let's say we want to analyse the following query:
 
 In order to analyse the performance of a query, you can click on the ``Analyze`` button on the Hasura console:
 
-.. thumbnail:: /img/graphql/manual/queries/analyze-query.png
+.. thumbnail:: /img/graphql/core/queries/analyze-query.png
    :class: no-shadow
    :width: 75%
    :alt: Query analyze button on Hasura console
 
 The following query execution plan is generated:
 
-.. thumbnail:: /img/graphql/manual/queries/query-analysis-before-index.png
+.. thumbnail:: /img/graphql/core/queries/query-analysis-before-index.png
    :class: no-shadow
    :width: 75%
    :alt: Execution plan for Hasura GraphQL query
@@ -227,7 +227,7 @@ Let's compare the performance analysis to :ref:`the one before adding the index
 What was a ``sequential scan`` in the example earlier is now an ``index scan``. ``Index scans`` are usually more performant than ``sequential scans``.
 We can also see that the ``cost`` of the query is now lower than the one before we added the index.
 
-.. thumbnail:: /img/graphql/manual/queries/query-analysis-after-index.png
+.. thumbnail:: /img/graphql/core/queries/query-analysis-after-index.png
    :class: no-shadow
    :width: 75%
    :alt: Execution plan for Hasura GraphQL query
diff --git a/docs/graphql/manual/queries/query-filters.rst b/docs/graphql/core/queries/query-filters.rst
similarity index 100%
rename from docs/graphql/manual/queries/query-filters.rst
rename to docs/graphql/core/queries/query-filters.rst
diff --git a/docs/graphql/manual/queries/simple-object-queries.rst b/docs/graphql/core/queries/simple-object-queries.rst
similarity index 100%
rename from docs/graphql/manual/queries/simple-object-queries.rst
rename to docs/graphql/core/queries/simple-object-queries.rst
diff --git a/docs/graphql/manual/queries/sorting.rst b/docs/graphql/core/queries/sorting.rst
similarity index 100%
rename from docs/graphql/manual/queries/sorting.rst
rename to docs/graphql/core/queries/sorting.rst
diff --git a/docs/graphql/manual/queries/variables-aliases-fragments-directives.rst b/docs/graphql/core/queries/variables-aliases-fragments-directives.rst
similarity index 100%
rename from docs/graphql/manual/queries/variables-aliases-fragments-directives.rst
rename to docs/graphql/core/queries/variables-aliases-fragments-directives.rst
diff --git a/docs/graphql/manual/remote-schemas/adding-schema.rst b/docs/graphql/core/remote-schemas/adding-schema.rst
similarity index 98%
rename from docs/graphql/manual/remote-schemas/adding-schema.rst
rename to docs/graphql/core/remote-schemas/adding-schema.rst
index 84eef707b1812..1b096007f3c6a 100644
--- a/docs/graphql/manual/remote-schemas/adding-schema.rst
+++ b/docs/graphql/core/remote-schemas/adding-schema.rst
@@ -37,7 +37,7 @@ To merge your remote schema with the GraphQL engine's auto-generated schema:
 
 Head to the ``Remote Schemas`` tab of the console and click on the ``Add`` button.
 
-.. thumbnail:: /img/graphql/manual/business-logic/add-remote-schemas-interface.png
+.. thumbnail:: /img/graphql/core/business-logic/add-remote-schemas-interface.png
    :alt: Merge remote schema
 
 You need to enter the following information:
diff --git a/docs/graphql/manual/remote-schemas/index.rst b/docs/graphql/core/remote-schemas/index.rst
similarity index 96%
rename from docs/graphql/manual/remote-schemas/index.rst
rename to docs/graphql/core/remote-schemas/index.rst
index 43a7b1fc5fa4b..59474d48feb88 100644
--- a/docs/graphql/manual/remote-schemas/index.rst
+++ b/docs/graphql/core/remote-schemas/index.rst
@@ -26,7 +26,7 @@ endpoint to Hasura. Your GraphQL service can be written in any language or frame
 This is what Hasura running with "Remote schemas" looks like:
 
 
-.. thumbnail:: /img/graphql/manual/remote-schemas/remote-schema-arch.png
+.. thumbnail:: /img/graphql/core/remote-schemas/remote-schema-arch.png
    :class: no-shadow
    :width: 900px
    :alt: Architecture of Hasura with remote schemas
diff --git a/docs/graphql/manual/remote-schemas/schema-auth.rst b/docs/graphql/core/remote-schemas/schema-auth.rst
similarity index 100%
rename from docs/graphql/manual/remote-schemas/schema-auth.rst
rename to docs/graphql/core/remote-schemas/schema-auth.rst
diff --git a/docs/graphql/manual/scheduled-triggers/create-cron-trigger.rst b/docs/graphql/core/scheduled-triggers/create-cron-trigger.rst
similarity index 94%
rename from docs/graphql/manual/scheduled-triggers/create-cron-trigger.rst
rename to docs/graphql/core/scheduled-triggers/create-cron-trigger.rst
index 93cb6207091b6..40d8a5b1181b1 100644
--- a/docs/graphql/manual/scheduled-triggers/create-cron-trigger.rst
+++ b/docs/graphql/core/scheduled-triggers/create-cron-trigger.rst
@@ -26,7 +26,7 @@ Step 1: Navigate to Cron Triggers
 - Click ``Cron Triggers``.
 - Click ``Create``.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/create-cron.png
+.. thumbnail:: /img/graphql/core/event-triggers/create-cron.png
    :alt: Adding a cron trigger
    :width: 1000px
 
@@ -47,7 +47,7 @@ Let's define the cron trigger.
       - **Cron schedule**: Enter a schedule for the cron. You can use the link next to the field to help `build a cron expression <https://crontab.guru/#*_*_*_*_*>`__, or use the ``Frequently used crons`` dropdown as a shortcut. Cron events are created based on the UTC timezone.
       - **Payload**: The JSON payload which will be sent to the webhook.
 
-      .. thumbnail:: /img/graphql/manual/event-triggers/define-cron-trigger.png
+      .. thumbnail:: /img/graphql/core/event-triggers/define-cron-trigger.png
          :alt: Defining a cron trigger
          :width: 550px
 
@@ -109,7 +109,7 @@ If you like, you can also define the following values:
 
       Expand the ``Advanced`` section.
 
-      .. thumbnail:: /img/graphql/manual/event-triggers/advanced-cron.png
+      .. thumbnail:: /img/graphql/core/event-triggers/advanced-cron.png
          :alt: Defining advanced options for a cron trigger
          :width: 700px
 
@@ -170,6 +170,6 @@ Schedule & logs
 
 Once you've created your cron trigger, you can see ``Pending events``, ``Processed events``, and ``Invocation logs`` in their respective tabs.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/pending-cron.png
+.. thumbnail:: /img/graphql/core/event-triggers/pending-cron.png
    :alt: Schedule and logs for cron triggers
    :width: 1200px
diff --git a/docs/graphql/manual/scheduled-triggers/create-one-off-scheduled-event.rst b/docs/graphql/core/scheduled-triggers/create-one-off-scheduled-event.rst
similarity index 92%
rename from docs/graphql/manual/scheduled-triggers/create-one-off-scheduled-event.rst
rename to docs/graphql/core/scheduled-triggers/create-one-off-scheduled-event.rst
index e7c93aee0526f..a0776e202cbe5 100644
--- a/docs/graphql/manual/scheduled-triggers/create-one-off-scheduled-event.rst
+++ b/docs/graphql/core/scheduled-triggers/create-one-off-scheduled-event.rst
@@ -26,7 +26,7 @@ Step 1: Navigate to One-off Scheduled Events
 - Click ``One-off Scheduled Events``.
 - Click ``Schedule an event``.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/one-off.png
+.. thumbnail:: /img/graphql/core/event-triggers/one-off.png
    :alt: Adding a one-off scheduled event
    :width: 900px
 
@@ -46,7 +46,7 @@ Define the following values for a scheduled event:
 
       In the form opened by the above step, fill out the following fields:
 
-      .. thumbnail:: /img/graphql/manual/event-triggers/define-one-off-event.png
+      .. thumbnail:: /img/graphql/core/event-triggers/define-one-off-event.png
          :alt: Defining the scheduled event
          :width: 550px
 
@@ -85,7 +85,7 @@ If you like, you can also define advanced values:
 
       Expand the ``Advanced`` section.
 
-      .. thumbnail:: /img/graphql/manual/event-triggers/advanced-one-off.png
+      .. thumbnail:: /img/graphql/core/event-triggers/advanced-one-off.png
          :alt: Defining advanced options for a scheduled event
          :width: 700px
 
@@ -128,6 +128,6 @@ Schedule & logs
 
 Once you've created your scheduled trigger, you can see ``Pending events``, ``Processed events``, and ``Invocation logs`` in their respective tabs.
 
-.. thumbnail:: /img/graphql/manual/event-triggers/pending-one-off.png
+.. thumbnail:: /img/graphql/core/event-triggers/pending-one-off.png
    :alt: Schedule and logs for scheduled events
    :width: 1200px
diff --git a/docs/graphql/manual/scheduled-triggers/index.rst b/docs/graphql/core/scheduled-triggers/index.rst
similarity index 91%
rename from docs/graphql/manual/scheduled-triggers/index.rst
rename to docs/graphql/core/scheduled-triggers/index.rst
index 1d585480cc76f..73061f72238cb 100644
--- a/docs/graphql/manual/scheduled-triggers/index.rst
+++ b/docs/graphql/core/scheduled-triggers/index.rst
@@ -17,7 +17,7 @@ Introduction
 
 Scheduled triggers are used to execute custom business logic at specific points in time.
 
-.. thumbnail:: /img/graphql/manual/scheduled-triggers/scheduled-trigger-arch.png
+.. thumbnail:: /img/graphql/core/scheduled-triggers/scheduled-trigger-arch.png
   :class: no-shadow
   :width: 700px
   :alt: Hasura scheduled trigger architecture
diff --git a/docs/graphql/manual/schema/basics.rst b/docs/graphql/core/schema/basics.rst
similarity index 98%
rename from docs/graphql/manual/schema/basics.rst
rename to docs/graphql/core/schema/basics.rst
index 88e0381d7b151..7522097b94dc9 100644
--- a/docs/graphql/manual/schema/basics.rst
+++ b/docs/graphql/core/schema/basics.rst
@@ -51,7 +51,7 @@ automatically generated.
 
 For example, here is the schema for the ``article`` table in this interface:
 
-.. thumbnail:: /img/graphql/manual/schema/create-table-graphql.png
+.. thumbnail:: /img/graphql/core/schema/create-table-graphql.png
    :alt: Schema for an article table
 
 The following object type and query/mutation fields are generated for the ``article`` table we just created:
diff --git a/docs/graphql/manual/schema/computed-fields.rst b/docs/graphql/core/schema/computed-fields.rst
similarity index 99%
rename from docs/graphql/manual/schema/computed-fields.rst
rename to docs/graphql/core/schema/computed-fields.rst
index 8fa2e8902100e..8eae983792bd5 100644
--- a/docs/graphql/manual/schema/computed-fields.rst
+++ b/docs/graphql/core/schema/computed-fields.rst
@@ -173,7 +173,7 @@ Adding a computed field to a table
      Head to the ``Modify`` tab of the table and click on the ``Add`` button in the ``Computed fields``
      section:
 
-     .. thumbnail:: /img/graphql/manual/schema/computed-field-create.png
+     .. thumbnail:: /img/graphql/core/schema/computed-field-create.png
 
      .. admonition:: Supported from
 
diff --git a/docs/graphql/manual/schema/custom-field-names.rst b/docs/graphql/core/schema/custom-field-names.rst
similarity index 91%
rename from docs/graphql/manual/schema/custom-field-names.rst
rename to docs/graphql/core/schema/custom-field-names.rst
index 06991e330bc65..8bb8aa06d3b8a 100644
--- a/docs/graphql/manual/schema/custom-field-names.rst
+++ b/docs/graphql/core/schema/custom-field-names.rst
@@ -31,7 +31,7 @@ Expose columns with a different name in the GraphQL API
 
      Head to the ``Data -> [table-name] -> Modify``
 
-     .. thumbnail:: /img/graphql/manual/schema/custom-field-name-column.png
+     .. thumbnail:: /img/graphql/core/schema/custom-field-name-column.png
         :alt: Customise GraphQL field name
 
   .. tab:: Metadata API
@@ -53,7 +53,7 @@ Expose table root fields with a different name in the GraphQL API
 
      Head to the ``Data -> [table-name] -> Modify``
 
-     .. thumbnail:: /img/graphql/manual/schema/custom-field-name-root-fields.png
+     .. thumbnail:: /img/graphql/core/schema/custom-field-name-root-fields.png
         :alt: Customise GraphQL root field
 
   .. tab:: Metadata API
diff --git a/docs/graphql/manual/schema/custom-functions.rst b/docs/graphql/core/schema/custom-functions.rst
similarity index 100%
rename from docs/graphql/manual/schema/custom-functions.rst
rename to docs/graphql/core/schema/custom-functions.rst
diff --git a/docs/graphql/manual/schema/data-validations.rst b/docs/graphql/core/schema/data-validations.rst
similarity index 96%
rename from docs/graphql/manual/schema/data-validations.rst
rename to docs/graphql/core/schema/data-validations.rst
index 64f87423c3d0a..d46e2fb238e54 100644
--- a/docs/graphql/manual/schema/data-validations.rst
+++ b/docs/graphql/core/schema/data-validations.rst
@@ -51,7 +51,7 @@ Let's say we have a table:
 Now, we can head to the ``Modify`` tab in the table page and add a check
 constraint in the ``Check Constraints`` section:
 
-.. thumbnail:: /img/graphql/manual/schema/validation-add-check-constraint.png
+.. thumbnail:: /img/graphql/core/schema/validation-add-check-constraint.png
    :alt: Add check constraint
 
 If someone now tries to add an author with a rating of ``11``, the following
@@ -185,7 +185,7 @@ Suppose, we have a table:
 
 Now, we can create a role ``user`` and add the following rule:
 
-.. thumbnail:: /img/graphql/manual/schema/validation-not-empty.png
+.. thumbnail:: /img/graphql/core/schema/validation-not-empty.png
    :alt: validation using permission: title cannot be empty
 
 If we try to insert an article with ``title = ""``, we will get a ``permission-error``:
@@ -233,7 +233,7 @@ Also, suppose there is an :ref:`object relationship <graphql_relationships>` ``a
 
 Now, we can create a role ``user`` and add the following rule:
 
-.. thumbnail:: /img/graphql/manual/schema/validation-author-isactive.png
+.. thumbnail:: /img/graphql/core/schema/validation-author-isactive.png
    :alt: validation using permissions: author should be active
 
 If we try to insert an article for an author for whom ``is_active = false``, we
@@ -291,7 +291,7 @@ or not.
 
 The validation process looks as follows:
 
-.. thumbnail:: /img/graphql/manual/schema/diagram-actions-data-validation.png
+.. thumbnail:: /img/graphql/core/schema/diagram-actions-data-validation.png
    :alt: validation using actions: article not deny-listed
    :width: 60%
 
@@ -301,7 +301,7 @@ Actions allow us to define :ref:`custom types <custom_types>` in our GraphQL sch
 We create a new action called ``InsertAuthor`` that takes an ``author`` object with type ``AuthorInput`` as input and
 returns an object of type ``AuthorOutput``:
 
-.. thumbnail:: /img/graphql/manual/schema/validation-actions-def.png
+.. thumbnail:: /img/graphql/core/schema/validation-actions-def.png
    :alt: Create action
 
 The business logic of an action - in our case the author validation - happens in the :ref:`action handler <action_handlers>`
diff --git a/docs/graphql/manual/schema/default-values/column-presets.rst b/docs/graphql/core/schema/default-values/column-presets.rst
similarity index 91%
rename from docs/graphql/manual/schema/default-values/column-presets.rst
rename to docs/graphql/core/schema/default-values/column-presets.rst
index 44184ed8ab6b8..31199e33ed9d3 100644
--- a/docs/graphql/manual/schema/default-values/column-presets.rst
+++ b/docs/graphql/core/schema/default-values/column-presets.rst
@@ -35,13 +35,13 @@ Step 1: Configure a column preset
 The column preset option is available under the ``Permissions`` tab of a table. Open the console and head to
 ``Data -> article -> Permissions``:
 
-.. thumbnail:: /img/graphql/manual/schema/column-presets-option.png
+.. thumbnail:: /img/graphql/core/schema/column-presets-option.png
    :alt: Add a column preset in the permissions tab
 
 Enable the column preset option to define presets for one or more columns. For each column, you can pick between
 setting the preset using a static value or from a session variable.
 
-.. thumbnail:: /img/graphql/manual/schema/column-presets-value-options.png
+.. thumbnail:: /img/graphql/core/schema/column-presets-value-options.png
    :alt: Configure the column preset
 
 For our chosen example, we'll use the ``from session variable`` option and configure the ``user_id`` column to be
@@ -65,13 +65,13 @@ to select from the* ``article`` *table*):
 As mentioned earlier, you'll notice when you add the ``X-Hasura-Role`` header that the field, ``user_id``, is no longer
 available as the mutation type's field:
 
-.. thumbnail:: /img/graphql/manual/schema/column-preset-schema-change-for-role.png
+.. thumbnail:: /img/graphql/core/schema/column-preset-schema-change-for-role.png
    :alt: Write an insert mutation
 
 Now, if we run the following insert mutation, we'll see that the ``user_id`` field is indeed being set with the value
 passed in the ``X-Hasura-User-Id`` variable:
 
-.. thumbnail:: /img/graphql/manual/schema/column-preset-mutation-result.png
+.. thumbnail:: /img/graphql/core/schema/column-preset-mutation-result.png
    :alt: Run the insert mutation
 
 .. note::
diff --git a/docs/graphql/manual/schema/default-values/created-updated-timestamps.rst b/docs/graphql/core/schema/default-values/created-updated-timestamps.rst
similarity index 97%
rename from docs/graphql/manual/schema/default-values/created-updated-timestamps.rst
rename to docs/graphql/core/schema/default-values/created-updated-timestamps.rst
index 5f88b0576e12f..2cc091a290cc4 100644
--- a/docs/graphql/manual/schema/default-values/created-updated-timestamps.rst
+++ b/docs/graphql/core/schema/default-values/created-updated-timestamps.rst
@@ -29,7 +29,7 @@ Add a created_at timestamp
     On the Hasura console, click on the ``Modify`` tab of a table. When clicking on the ``+Frequently used columns`` button, 
     choose ``created_at``:
 
-    .. thumbnail:: /img/graphql/manual/schema/created-at.png
+    .. thumbnail:: /img/graphql/core/schema/created-at.png
         :alt: Add a created_at time on the Hasura console
 
     Click the ``Add column`` button.
@@ -83,7 +83,7 @@ Add an updated_at timestamp
     On the Hasura console, click on the ``Modify`` tab of a table. When clicking on the ``+Frequently used columns`` button, 
     choose ``updated_at``:
 
-    .. thumbnail:: /img/graphql/manual/schema/updated-at.png
+    .. thumbnail:: /img/graphql/core/schema/updated-at.png
         :alt: Add an updated_at time on the Hasura console
 
     Click the ``Add column`` button.
diff --git a/docs/graphql/manual/schema/default-values/index.rst b/docs/graphql/core/schema/default-values/index.rst
similarity index 100%
rename from docs/graphql/manual/schema/default-values/index.rst
rename to docs/graphql/core/schema/default-values/index.rst
diff --git a/docs/graphql/manual/schema/default-values/postgres-defaults.rst b/docs/graphql/core/schema/default-values/postgres-defaults.rst
similarity index 97%
rename from docs/graphql/manual/schema/default-values/postgres-defaults.rst
rename to docs/graphql/core/schema/default-values/postgres-defaults.rst
index e1a8c138849ef..c2ccf400ede5f 100644
--- a/docs/graphql/manual/schema/default-values/postgres-defaults.rst
+++ b/docs/graphql/core/schema/default-values/postgres-defaults.rst
@@ -33,7 +33,7 @@ Edit the ``created_at`` field and set its default value as the SQL function ``no
 
 Open the console and head to ``Data -> article -> Modify``:
 
-.. thumbnail:: /img/graphql/manual/schema/add-default-value.png
+.. thumbnail:: /img/graphql/core/schema/add-default-value.png
    :alt: Modify the table in the console
 
 .. admonition:: To set an auto-incrementing default value
diff --git a/docs/graphql/manual/schema/default-values/sql-functions.rst b/docs/graphql/core/schema/default-values/sql-functions.rst
similarity index 96%
rename from docs/graphql/manual/schema/default-values/sql-functions.rst
rename to docs/graphql/core/schema/default-values/sql-functions.rst
index ca7e60d0764ff..38065dc8e8ae4 100644
--- a/docs/graphql/manual/schema/default-values/sql-functions.rst
+++ b/docs/graphql/core/schema/default-values/sql-functions.rst
@@ -42,7 +42,7 @@ Modify the table ``sql_function_table`` and make its ``output`` column nullable.
 
 Open the console and head to ``Data -> sql_function_table -> Modify``:
 
-.. thumbnail:: /img/graphql/manual/schema/modify-sql-fn-table.png
+.. thumbnail:: /img/graphql/core/schema/modify-sql-fn-table.png
    :alt: Modify the table
 
 Step 2: Create a trigger
@@ -65,7 +65,7 @@ the ``output`` field whenever an insert or update is made to the ``sql_function_
 
 Head to ``Data -> SQL`` and run the above SQL:
 
-.. thumbnail:: /img/graphql/manual/schema/create-trigger.png
+.. thumbnail:: /img/graphql/core/schema/create-trigger.png
    :alt: Create a trigger with SQL
 
 Step 3: Run an insert mutation
diff --git a/docs/graphql/manual/schema/derived-data.rst.wip b/docs/graphql/core/schema/derived-data.rst.wip
similarity index 100%
rename from docs/graphql/manual/schema/derived-data.rst.wip
rename to docs/graphql/core/schema/derived-data.rst.wip
diff --git a/docs/graphql/manual/schema/enums.rst b/docs/graphql/core/schema/enums.rst
similarity index 99%
rename from docs/graphql/manual/schema/enums.rst
rename to docs/graphql/core/schema/enums.rst
index e08d5b5b7d5be..97db53a2c28f4 100644
--- a/docs/graphql/manual/schema/enums.rst
+++ b/docs/graphql/core/schema/enums.rst
@@ -147,7 +147,7 @@ we need to tell Hasura that this table represents an enum.
     Head to the ``Modify`` tab of the table and toggle the switch in the
     ``Set table as enum`` section:
 
-    .. thumbnail:: /img/graphql/manual/schema/enum-set.png
+    .. thumbnail:: /img/graphql/core/schema/enum-set.png
        :alt: Set table as enum
 
   .. tab:: API
diff --git a/docs/graphql/manual/schema/export-graphql-schema.rst b/docs/graphql/core/schema/export-graphql-schema.rst
similarity index 100%
rename from docs/graphql/manual/schema/export-graphql-schema.rst
rename to docs/graphql/core/schema/export-graphql-schema.rst
diff --git a/docs/graphql/manual/schema/import-database.rst.wip b/docs/graphql/core/schema/import-database.rst.wip
similarity index 100%
rename from docs/graphql/manual/schema/import-database.rst.wip
rename to docs/graphql/core/schema/import-database.rst.wip
diff --git a/docs/graphql/manual/schema/index.rst b/docs/graphql/core/schema/index.rst
similarity index 100%
rename from docs/graphql/manual/schema/index.rst
rename to docs/graphql/core/schema/index.rst
diff --git a/docs/graphql/manual/schema/relay-schema.rst b/docs/graphql/core/schema/relay-schema.rst
similarity index 98%
rename from docs/graphql/manual/schema/relay-schema.rst
rename to docs/graphql/core/schema/relay-schema.rst
index 973d4895b56a0..54b3f80386cc0 100644
--- a/docs/graphql/manual/schema/relay-schema.rst
+++ b/docs/graphql/core/schema/relay-schema.rst
@@ -17,7 +17,7 @@ Introduction
 
 The Hasura GraphQL engine serves a `Relay <https://relay.dev/>`__ schema for Postgres tables which have a primary key defined. The Relay schema can be accessed through the ``/v1beta1/relay`` endpoint.
 
-.. thumbnail:: /img/graphql/manual/schema/relay.png
+.. thumbnail:: /img/graphql/core/schema/relay.png
    :alt: Relay API toggle
 
 .. admonition:: Supported from
diff --git a/docs/graphql/manual/schema/remote-relationships/action-relationships.rst b/docs/graphql/core/schema/remote-relationships/action-relationships.rst
similarity index 97%
rename from docs/graphql/manual/schema/remote-relationships/action-relationships.rst
rename to docs/graphql/core/schema/remote-relationships/action-relationships.rst
index b9954c3a273c8..a4053db0bbbf1 100644
--- a/docs/graphql/manual/schema/remote-relationships/action-relationships.rst
+++ b/docs/graphql/core/schema/remote-relationships/action-relationships.rst
@@ -34,7 +34,7 @@ Step 1: Open the action relationship section
 - From your action, go to the ``Relationships`` tab.
 - Click ``Add a relationship``.
 
-.. thumbnail:: /img/graphql/manual/remote-joins/action-rel.png
+.. thumbnail:: /img/graphql/core/remote-joins/action-rel.png
    :alt: Opening the action relationship section
    :width: 559px
 
@@ -63,7 +63,7 @@ The following values can be defined for an action relationship:
 
     In the section opened by the above step, fill out the following fields:
 
-    .. thumbnail:: /img/graphql/manual/remote-joins/define-action-rel.png
+    .. thumbnail:: /img/graphql/core/remote-joins/define-action-rel.png
       :alt: Defining the relationship
       :width: 850px
 
diff --git a/docs/graphql/manual/schema/remote-relationships/index.rst b/docs/graphql/core/schema/remote-relationships/index.rst
similarity index 100%
rename from docs/graphql/manual/schema/remote-relationships/index.rst
rename to docs/graphql/core/schema/remote-relationships/index.rst
diff --git a/docs/graphql/manual/schema/remote-relationships/remote-schema-relationships.rst b/docs/graphql/core/schema/remote-relationships/remote-schema-relationships.rst
similarity index 97%
rename from docs/graphql/manual/schema/remote-relationships/remote-schema-relationships.rst
rename to docs/graphql/core/schema/remote-relationships/remote-schema-relationships.rst
index bcf9a85b169ad..37da0474a8c47 100644
--- a/docs/graphql/manual/schema/remote-relationships/remote-schema-relationships.rst
+++ b/docs/graphql/core/schema/remote-relationships/remote-schema-relationships.rst
@@ -43,7 +43,7 @@ Step 1: Open the remote relationship section
 - From your table, go to the ``Relationships`` tab.
 - Click the ``Add a remote relationship`` button.
 
-.. thumbnail:: /img/graphql/manual/remote-joins/add.png
+.. thumbnail:: /img/graphql/core/remote-joins/add.png
    :alt: Opening the remote relationship section
    :width: 1000px
 
@@ -66,7 +66,7 @@ For this example, we assume that our schema has a ``users`` table with the field
 
   .. tab:: Console
 
-    .. thumbnail:: /img/graphql/manual/remote-joins/define.png
+    .. thumbnail:: /img/graphql/core/remote-joins/define.png
       :alt: Defining the relationship
       :width: 800px
 
diff --git a/docs/graphql/manual/schema/table-relationships/create.rst b/docs/graphql/core/schema/table-relationships/create.rst
similarity index 94%
rename from docs/graphql/manual/schema/table-relationships/create.rst
rename to docs/graphql/core/schema/table-relationships/create.rst
index 3859ecb3109d7..34083252665ec 100644
--- a/docs/graphql/manual/schema/table-relationships/create.rst
+++ b/docs/graphql/core/schema/table-relationships/create.rst
@@ -38,7 +38,7 @@ In the console, navigate to the ``Modify`` tab of the ``article`` table. Click t
 the Foreign Keys section and configure the ``author_id`` column as a foreign-key for the ``id`` column in
 the ``author`` table:
 
-.. thumbnail:: /img/graphql/manual/schema/add-foreign-key.png
+.. thumbnail:: /img/graphql/core/schema/add-foreign-key.png
    :alt: Add foreign-key constraint
 
 Step 2: Create an object relationship
@@ -51,7 +51,7 @@ The console infers this using the foreign-key created above and recommends the p
 
 Add an ``object relationship`` named ``author`` for the ``article`` table as shown here:
 
-.. thumbnail:: /img/graphql/manual/schema/add-1-1-relationship.png
+.. thumbnail:: /img/graphql/core/schema/add-1-1-relationship.png
    :alt: Create an object relationship
 
 We can now run a nested object query that is based on this ``object relationship``.
@@ -112,7 +112,7 @@ You can add an ``array relationship`` in the same fashion as an ``object relatio
 
 Add an ``array relationship`` named ``articles`` for the ``author`` table as shown here:
 
-.. thumbnail:: /img/graphql/manual/schema/add-1-many-relationship.png
+.. thumbnail:: /img/graphql/core/schema/add-1-many-relationship.png
    :alt: Create an array relationship
 
 We can now run a nested object query that is based on this ``array relationship``.
@@ -203,7 +203,7 @@ Step 1: Open the manual relationship section
 - Open the console and navigate to the ``Data -> author -> Relationships`` tab.
 - Click on the ``Configure`` button:
 
-.. thumbnail:: /img/graphql/manual/schema/manual-relationship-btn.png
+.. thumbnail:: /img/graphql/core/schema/manual-relationship-btn.png
    :alt: Open the manual relationship section
 
 Step 2: Define the relationship
@@ -211,7 +211,7 @@ Step 2: Define the relationship
 
 The above step will open up a section as shown below:
 
-.. thumbnail:: /img/graphql/manual/schema/manual-relationship-create.png
+.. thumbnail:: /img/graphql/core/schema/manual-relationship-create.png
    :alt: Define the relationship
 
 In this case:
diff --git a/docs/graphql/manual/schema/table-relationships/database-modelling/index.rst b/docs/graphql/core/schema/table-relationships/database-modelling/index.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/database-modelling/index.rst
rename to docs/graphql/core/schema/table-relationships/database-modelling/index.rst
diff --git a/docs/graphql/manual/schema/table-relationships/database-modelling/many-to-many.rst b/docs/graphql/core/schema/table-relationships/database-modelling/many-to-many.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/database-modelling/many-to-many.rst
rename to docs/graphql/core/schema/table-relationships/database-modelling/many-to-many.rst
diff --git a/docs/graphql/manual/schema/table-relationships/database-modelling/one-to-many.rst b/docs/graphql/core/schema/table-relationships/database-modelling/one-to-many.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/database-modelling/one-to-many.rst
rename to docs/graphql/core/schema/table-relationships/database-modelling/one-to-many.rst
diff --git a/docs/graphql/manual/schema/table-relationships/database-modelling/one-to-one.rst b/docs/graphql/core/schema/table-relationships/database-modelling/one-to-one.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/database-modelling/one-to-one.rst
rename to docs/graphql/core/schema/table-relationships/database-modelling/one-to-one.rst
diff --git a/docs/graphql/manual/schema/table-relationships/index.rst b/docs/graphql/core/schema/table-relationships/index.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/index.rst
rename to docs/graphql/core/schema/table-relationships/index.rst
diff --git a/docs/graphql/manual/schema/table-relationships/rename.rst b/docs/graphql/core/schema/table-relationships/rename.rst
similarity index 100%
rename from docs/graphql/manual/schema/table-relationships/rename.rst
rename to docs/graphql/core/schema/table-relationships/rename.rst
diff --git a/docs/graphql/manual/schema/using-existing-database.rst b/docs/graphql/core/schema/using-existing-database.rst
similarity index 100%
rename from docs/graphql/manual/schema/using-existing-database.rst
rename to docs/graphql/core/schema/using-existing-database.rst
diff --git a/docs/graphql/manual/schema/views.rst b/docs/graphql/core/schema/views.rst
similarity index 100%
rename from docs/graphql/manual/schema/views.rst
rename to docs/graphql/core/schema/views.rst
diff --git a/docs/graphql/manual/security-disclosure/index.rst b/docs/graphql/core/security-disclosure/index.rst
similarity index 100%
rename from docs/graphql/manual/security-disclosure/index.rst
rename to docs/graphql/core/security-disclosure/index.rst
diff --git a/docs/graphql/manual/subscriptions/index.rst b/docs/graphql/core/subscriptions/index.rst
similarity index 100%
rename from docs/graphql/manual/subscriptions/index.rst
rename to docs/graphql/core/subscriptions/index.rst
diff --git a/docs/graphql/manual/subscriptions/use-cases.rst b/docs/graphql/core/subscriptions/use-cases.rst
similarity index 100%
rename from docs/graphql/manual/subscriptions/use-cases.rst
rename to docs/graphql/core/subscriptions/use-cases.rst
diff --git a/docs/graphql/manual/troubleshooting/index.rst b/docs/graphql/core/troubleshooting/index.rst
similarity index 100%
rename from docs/graphql/manual/troubleshooting/index.rst
rename to docs/graphql/core/troubleshooting/index.rst
diff --git a/docs/graphql/manual/version-control/index.rst.wip b/docs/graphql/core/version-control/index.rst.wip
similarity index 100%
rename from docs/graphql/manual/version-control/index.rst.wip
rename to docs/graphql/core/version-control/index.rst.wip
diff --git a/docs/img/cloud/getting-started/connect-db.png b/docs/img/graphql/cloud/getting-started/connect-db.png
similarity index 100%
rename from docs/img/cloud/getting-started/connect-db.png
rename to docs/img/graphql/cloud/getting-started/connect-db.png
diff --git a/docs/img/cloud/getting-started/connect-existing-db.png b/docs/img/graphql/cloud/getting-started/connect-existing-db.png
similarity index 100%
rename from docs/img/cloud/getting-started/connect-existing-db.png
rename to docs/img/graphql/cloud/getting-started/connect-existing-db.png
diff --git a/docs/img/cloud/getting-started/create-project-existing-db.png b/docs/img/graphql/cloud/getting-started/create-project-existing-db.png
similarity index 100%
rename from docs/img/cloud/getting-started/create-project-existing-db.png
rename to docs/img/graphql/cloud/getting-started/create-project-existing-db.png
diff --git a/docs/img/cloud/getting-started/create-project-new-db.png b/docs/img/graphql/cloud/getting-started/create-project-new-db.png
similarity index 100%
rename from docs/img/cloud/getting-started/create-project-new-db.png
rename to docs/img/graphql/cloud/getting-started/create-project-new-db.png
diff --git a/docs/img/cloud/getting-started/project-actions.png b/docs/img/graphql/cloud/getting-started/project-actions.png
similarity index 100%
rename from docs/img/cloud/getting-started/project-actions.png
rename to docs/img/graphql/cloud/getting-started/project-actions.png
diff --git a/docs/img/cloud/getting-started/project-functionalities.png b/docs/img/graphql/cloud/getting-started/project-functionalities.png
similarity index 100%
rename from docs/img/cloud/getting-started/project-functionalities.png
rename to docs/img/graphql/cloud/getting-started/project-functionalities.png
diff --git a/docs/img/cloud/metrics/inspect-error.png b/docs/img/graphql/cloud/metrics/inspect-error.png
similarity index 100%
rename from docs/img/cloud/metrics/inspect-error.png
rename to docs/img/graphql/cloud/metrics/inspect-error.png
diff --git a/docs/img/cloud/metrics/pro-tab-errors.png b/docs/img/graphql/cloud/metrics/pro-tab-errors.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-errors.png
rename to docs/img/graphql/cloud/metrics/pro-tab-errors.png
diff --git a/docs/img/cloud/metrics/pro-tab-operations-inspect.png b/docs/img/graphql/cloud/metrics/pro-tab-operations-inspect.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-operations-inspect.png
rename to docs/img/graphql/cloud/metrics/pro-tab-operations-inspect.png
diff --git a/docs/img/cloud/metrics/pro-tab-operations.png b/docs/img/graphql/cloud/metrics/pro-tab-operations.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-operations.png
rename to docs/img/graphql/cloud/metrics/pro-tab-operations.png
diff --git a/docs/img/cloud/metrics/pro-tab-overview.png b/docs/img/graphql/cloud/metrics/pro-tab-overview.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-overview.png
rename to docs/img/graphql/cloud/metrics/pro-tab-overview.png
diff --git a/docs/img/cloud/metrics/pro-tab-subscription-workers.png b/docs/img/graphql/cloud/metrics/pro-tab-subscription-workers.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-subscription-workers.png
rename to docs/img/graphql/cloud/metrics/pro-tab-subscription-workers.png
diff --git a/docs/img/cloud/metrics/pro-tab-usage.png b/docs/img/graphql/cloud/metrics/pro-tab-usage.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-usage.png
rename to docs/img/graphql/cloud/metrics/pro-tab-usage.png
diff --git a/docs/img/cloud/metrics/pro-tab-websockets.png b/docs/img/graphql/cloud/metrics/pro-tab-websockets.png
similarity index 100%
rename from docs/img/cloud/metrics/pro-tab-websockets.png
rename to docs/img/graphql/cloud/metrics/pro-tab-websockets.png
diff --git a/docs/img/cloud/projects/add-collaborator.png b/docs/img/graphql/cloud/projects/add-collaborator.png
similarity index 100%
rename from docs/img/cloud/projects/add-collaborator.png
rename to docs/img/graphql/cloud/projects/add-collaborator.png
diff --git a/docs/img/cloud/projects/add-custom-domain.png b/docs/img/graphql/cloud/projects/add-custom-domain.png
similarity index 100%
rename from docs/img/cloud/projects/add-custom-domain.png
rename to docs/img/graphql/cloud/projects/add-custom-domain.png
diff --git a/docs/img/cloud/projects/add-env-var.png b/docs/img/graphql/cloud/projects/add-env-var.png
similarity index 100%
rename from docs/img/cloud/projects/add-env-var.png
rename to docs/img/graphql/cloud/projects/add-env-var.png
diff --git a/docs/img/cloud/projects/choose-custom-domain.png b/docs/img/graphql/cloud/projects/choose-custom-domain.png
similarity index 100%
rename from docs/img/cloud/projects/choose-custom-domain.png
rename to docs/img/graphql/cloud/projects/choose-custom-domain.png
diff --git a/docs/img/cloud/projects/cloud-create-project.png b/docs/img/graphql/cloud/projects/cloud-create-project.png
similarity index 100%
rename from docs/img/cloud/projects/cloud-create-project.png
rename to docs/img/graphql/cloud/projects/cloud-create-project.png
diff --git a/docs/img/cloud/projects/cloud-project-invitation.png b/docs/img/graphql/cloud/projects/cloud-project-invitation.png
similarity index 100%
rename from docs/img/cloud/projects/cloud-project-invitation.png
rename to docs/img/graphql/cloud/projects/cloud-project-invitation.png
diff --git a/docs/img/cloud/projects/cloud-projects-dashboard.png b/docs/img/graphql/cloud/projects/cloud-projects-dashboard.png
similarity index 100%
rename from docs/img/cloud/projects/cloud-projects-dashboard.png
rename to docs/img/graphql/cloud/projects/cloud-projects-dashboard.png
diff --git a/docs/img/cloud/projects/create-new-project.png b/docs/img/graphql/cloud/projects/create-new-project.png
similarity index 100%
rename from docs/img/cloud/projects/create-new-project.png
rename to docs/img/graphql/cloud/projects/create-new-project.png
diff --git a/docs/img/cloud/projects/create-project-heroku.png b/docs/img/graphql/cloud/projects/create-project-heroku.png
similarity index 100%
rename from docs/img/cloud/projects/create-project-heroku.png
rename to docs/img/graphql/cloud/projects/create-project-heroku.png
diff --git a/docs/img/cloud/projects/dns-settings.png b/docs/img/graphql/cloud/projects/dns-settings.png
similarity index 100%
rename from docs/img/cloud/projects/dns-settings.png
rename to docs/img/graphql/cloud/projects/dns-settings.png
diff --git a/docs/img/cloud/projects/dns-validated.png b/docs/img/graphql/cloud/projects/dns-validated.png
similarity index 100%
rename from docs/img/cloud/projects/dns-validated.png
rename to docs/img/graphql/cloud/projects/dns-validated.png
diff --git a/docs/img/cloud/projects/dns-validation-pending.png b/docs/img/graphql/cloud/projects/dns-validation-pending.png
similarity index 100%
rename from docs/img/cloud/projects/dns-validation-pending.png
rename to docs/img/graphql/cloud/projects/dns-validation-pending.png
diff --git a/docs/img/cloud/projects/existing-db-setup.png b/docs/img/graphql/cloud/projects/existing-db-setup.png
similarity index 100%
rename from docs/img/cloud/projects/existing-db-setup.png
rename to docs/img/graphql/cloud/projects/existing-db-setup.png
diff --git a/docs/img/cloud/projects/gcp-postgres-authorized-network.png b/docs/img/graphql/cloud/projects/gcp-postgres-authorized-network.png
similarity index 100%
rename from docs/img/cloud/projects/gcp-postgres-authorized-network.png
rename to docs/img/graphql/cloud/projects/gcp-postgres-authorized-network.png
diff --git a/docs/img/cloud/projects/hasura-cloud-ip.png b/docs/img/graphql/cloud/projects/hasura-cloud-ip.png
similarity index 100%
rename from docs/img/cloud/projects/hasura-cloud-ip.png
rename to docs/img/graphql/cloud/projects/hasura-cloud-ip.png
diff --git a/docs/img/cloud/projects/manage-project.png b/docs/img/graphql/cloud/projects/manage-project.png
similarity index 100%
rename from docs/img/cloud/projects/manage-project.png
rename to docs/img/graphql/cloud/projects/manage-project.png
diff --git a/docs/img/cloud/projects/new-project-hosted.png b/docs/img/graphql/cloud/projects/new-project-hosted.png
similarity index 100%
rename from docs/img/cloud/projects/new-project-hosted.png
rename to docs/img/graphql/cloud/projects/new-project-hosted.png
diff --git a/docs/img/cloud/projects/new-project-self-hosted.png b/docs/img/graphql/cloud/projects/new-project-self-hosted.png
similarity index 100%
rename from docs/img/cloud/projects/new-project-self-hosted.png
rename to docs/img/graphql/cloud/projects/new-project-self-hosted.png
diff --git a/docs/img/cloud/projects/project-details.png b/docs/img/graphql/cloud/projects/project-details.png
similarity index 100%
rename from docs/img/cloud/projects/project-details.png
rename to docs/img/graphql/cloud/projects/project-details.png
diff --git a/docs/img/cloud/projects/projects-delete.png b/docs/img/graphql/cloud/projects/projects-delete.png
similarity index 100%
rename from docs/img/cloud/projects/projects-delete.png
rename to docs/img/graphql/cloud/projects/projects-delete.png
diff --git a/docs/img/cloud/projects/projects-list.png b/docs/img/graphql/cloud/projects/projects-list.png
similarity index 100%
rename from docs/img/cloud/projects/projects-list.png
rename to docs/img/graphql/cloud/projects/projects-list.png
diff --git a/docs/img/cloud/projects/secure-add-envvar.png b/docs/img/graphql/cloud/projects/secure-add-envvar.png
similarity index 100%
rename from docs/img/cloud/projects/secure-add-envvar.png
rename to docs/img/graphql/cloud/projects/secure-add-envvar.png
diff --git a/docs/img/cloud/projects/secure-envvars.png b/docs/img/graphql/cloud/projects/secure-envvars.png
similarity index 100%
rename from docs/img/cloud/projects/secure-envvars.png
rename to docs/img/graphql/cloud/projects/secure-envvars.png
diff --git a/docs/img/cloud/projects/secure-settings.png b/docs/img/graphql/cloud/projects/secure-settings.png
similarity index 100%
rename from docs/img/cloud/projects/secure-settings.png
rename to docs/img/graphql/cloud/projects/secure-settings.png
diff --git a/docs/img/cloud/projects/team-view.png b/docs/img/graphql/cloud/projects/team-view.png
similarity index 100%
rename from docs/img/cloud/projects/team-view.png
rename to docs/img/graphql/cloud/projects/team-view.png
diff --git a/docs/img/cloud/reliability/regression-testing-diagram.png b/docs/img/graphql/cloud/reliability/regression-testing-diagram.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-testing-diagram.png
rename to docs/img/graphql/cloud/reliability/regression-testing-diagram.png
diff --git a/docs/img/cloud/reliability/regression-tests-add-operations.png b/docs/img/graphql/cloud/reliability/regression-tests-add-operations.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-add-operations.png
rename to docs/img/graphql/cloud/reliability/regression-tests-add-operations.png
diff --git a/docs/img/cloud/reliability/regression-tests-past-runs.png b/docs/img/graphql/cloud/reliability/regression-tests-past-runs.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-past-runs.png
rename to docs/img/graphql/cloud/reliability/regression-tests-past-runs.png
diff --git a/docs/img/cloud/reliability/regression-tests-results.png b/docs/img/graphql/cloud/reliability/regression-tests-results.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-results.png
rename to docs/img/graphql/cloud/reliability/regression-tests-results.png
diff --git a/docs/img/cloud/reliability/regression-tests-run-cli.png b/docs/img/graphql/cloud/reliability/regression-tests-run-cli.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-run-cli.png
rename to docs/img/graphql/cloud/reliability/regression-tests-run-cli.png
diff --git a/docs/img/cloud/reliability/regression-tests-run-tests.png b/docs/img/graphql/cloud/reliability/regression-tests-run-tests.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-run-tests.png
rename to docs/img/graphql/cloud/reliability/regression-tests-run-tests.png
diff --git a/docs/img/cloud/reliability/regression-tests-suites.png b/docs/img/graphql/cloud/reliability/regression-tests-suites.png
similarity index 100%
rename from docs/img/cloud/reliability/regression-tests-suites.png
rename to docs/img/graphql/cloud/reliability/regression-tests-suites.png
diff --git a/docs/img/cloud/reliability/regressions-run-prod-tests-on-dev.png b/docs/img/graphql/cloud/reliability/regressions-run-prod-tests-on-dev.png
similarity index 100%
rename from docs/img/cloud/reliability/regressions-run-prod-tests-on-dev.png
rename to docs/img/graphql/cloud/reliability/regressions-run-prod-tests-on-dev.png
diff --git a/docs/img/cloud/security/allowlist-add-new-op.png b/docs/img/graphql/cloud/security/allowlist-add-new-op.png
similarity index 100%
rename from docs/img/cloud/security/allowlist-add-new-op.png
rename to docs/img/graphql/cloud/security/allowlist-add-new-op.png
diff --git a/docs/img/cloud/security/pro-tab-apilimit-config.png b/docs/img/graphql/cloud/security/pro-tab-apilimit-config.png
similarity index 100%
rename from docs/img/cloud/security/pro-tab-apilimit-config.png
rename to docs/img/graphql/cloud/security/pro-tab-apilimit-config.png
diff --git a/docs/img/cloud/security/pro-tab-apilimits.png b/docs/img/graphql/cloud/security/pro-tab-apilimits.png
similarity index 100%
rename from docs/img/cloud/security/pro-tab-apilimits.png
rename to docs/img/graphql/cloud/security/pro-tab-apilimits.png
diff --git a/docs/img/cloud/security/pro-tabs-allowlist.png b/docs/img/graphql/cloud/security/pro-tabs-allowlist.png
similarity index 100%
rename from docs/img/cloud/security/pro-tabs-allowlist.png
rename to docs/img/graphql/cloud/security/pro-tabs-allowlist.png
diff --git a/docs/img/cloud/tracing/tracing-operations-timing.png b/docs/img/graphql/cloud/tracing/tracing-operations-timing.png
similarity index 100%
rename from docs/img/cloud/tracing/tracing-operations-timing.png
rename to docs/img/graphql/cloud/tracing/tracing-operations-timing.png
diff --git a/docs/img/graphql/manual/actions/action-array-relationship.png b/docs/img/graphql/core/actions/action-array-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/actions/action-array-relationship.png
rename to docs/img/graphql/core/actions/action-array-relationship.png
diff --git a/docs/img/graphql/manual/actions/action-object-relationship.png b/docs/img/graphql/core/actions/action-object-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/actions/action-object-relationship.png
rename to docs/img/graphql/core/actions/action-object-relationship.png
diff --git a/docs/img/graphql/manual/actions/action-secret-header.png b/docs/img/graphql/core/actions/action-secret-header.png
similarity index 100%
rename from docs/img/graphql/manual/actions/action-secret-header.png
rename to docs/img/graphql/core/actions/action-secret-header.png
diff --git a/docs/img/graphql/manual/actions/actions-arch.png b/docs/img/graphql/core/actions/actions-arch.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-arch.png
rename to docs/img/graphql/core/actions/actions-arch.png
diff --git a/docs/img/graphql/manual/actions/actions-derive-button.png b/docs/img/graphql/core/actions/actions-derive-button.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-derive-button.png
rename to docs/img/graphql/core/actions/actions-derive-button.png
diff --git a/docs/img/graphql/manual/actions/actions-derive-codegen.png b/docs/img/graphql/core/actions/actions-derive-codegen.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-derive-codegen.png
rename to docs/img/graphql/core/actions/actions-derive-codegen.png
diff --git a/docs/img/graphql/manual/actions/actions-derive-types.png b/docs/img/graphql/core/actions/actions-derive-types.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-derive-types.png
rename to docs/img/graphql/core/actions/actions-derive-types.png
diff --git a/docs/img/graphql/manual/actions/actions-permissions.png b/docs/img/graphql/core/actions/actions-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-permissions.png
rename to docs/img/graphql/core/actions/actions-permissions.png
diff --git a/docs/img/graphql/manual/actions/actions-relationship.png b/docs/img/graphql/core/actions/actions-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/actions/actions-relationship.png
rename to docs/img/graphql/core/actions/actions-relationship.png
diff --git a/docs/img/graphql/manual/actions/cli-framework-prompt.png b/docs/img/graphql/core/actions/cli-framework-prompt.png
similarity index 100%
rename from docs/img/graphql/manual/actions/cli-framework-prompt.png
rename to docs/img/graphql/core/actions/cli-framework-prompt.png
diff --git a/docs/img/graphql/manual/actions/cli-output-dir-prompt.png b/docs/img/graphql/core/actions/cli-output-dir-prompt.png
similarity index 100%
rename from docs/img/graphql/manual/actions/cli-output-dir-prompt.png
rename to docs/img/graphql/core/actions/cli-output-dir-prompt.png
diff --git a/docs/img/graphql/manual/actions/cli-starter-kit-prompt.png b/docs/img/graphql/core/actions/cli-starter-kit-prompt.png
similarity index 100%
rename from docs/img/graphql/manual/actions/cli-starter-kit-prompt.png
rename to docs/img/graphql/core/actions/cli-starter-kit-prompt.png
diff --git a/docs/img/graphql/manual/actions/console-codegen-tab.png b/docs/img/graphql/core/actions/console-codegen-tab.png
similarity index 100%
rename from docs/img/graphql/manual/actions/console-codegen-tab.png
rename to docs/img/graphql/core/actions/console-codegen-tab.png
diff --git a/docs/img/graphql/manual/actions/mutation-action-create.png b/docs/img/graphql/core/actions/mutation-action-create.png
similarity index 100%
rename from docs/img/graphql/manual/actions/mutation-action-create.png
rename to docs/img/graphql/core/actions/mutation-action-create.png
diff --git a/docs/img/graphql/manual/actions/query-action-create.png b/docs/img/graphql/core/actions/query-action-create.png
similarity index 100%
rename from docs/img/graphql/manual/actions/query-action-create.png
rename to docs/img/graphql/core/actions/query-action-create.png
diff --git a/docs/img/graphql/manual/actions/update-address-action-definition.png b/docs/img/graphql/core/actions/update-address-action-definition.png
similarity index 100%
rename from docs/img/graphql/manual/actions/update-address-action-definition.png
rename to docs/img/graphql/core/actions/update-address-action-definition.png
diff --git a/docs/img/graphql/manual/actions/update-author-action-definition.png b/docs/img/graphql/core/actions/update-author-action-definition.png
similarity index 100%
rename from docs/img/graphql/manual/actions/update-author-action-definition.png
rename to docs/img/graphql/core/actions/update-author-action-definition.png
diff --git a/docs/img/graphql/manual/auth/aggregation-query-permissions.png b/docs/img/graphql/core/auth/aggregation-query-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/aggregation-query-permissions.png
rename to docs/img/graphql/core/auth/aggregation-query-permissions.png
diff --git a/docs/img/graphql/manual/auth/anonymous-role-examples.png b/docs/img/graphql/core/auth/anonymous-role-examples.png
similarity index 100%
rename from docs/img/graphql/manual/auth/anonymous-role-examples.png
rename to docs/img/graphql/core/auth/anonymous-role-examples.png
diff --git a/docs/img/graphql/manual/auth/array-relationship-reviewers.png b/docs/img/graphql/core/auth/array-relationship-reviewers.png
similarity index 100%
rename from docs/img/graphql/manual/auth/array-relationship-reviewers.png
rename to docs/img/graphql/core/auth/array-relationship-reviewers.png
diff --git a/docs/img/graphql/manual/auth/auth-high-level-overview.png b/docs/img/graphql/core/auth/auth-high-level-overview.png
similarity index 100%
rename from docs/img/graphql/manual/auth/auth-high-level-overview.png
rename to docs/img/graphql/core/auth/auth-high-level-overview.png
diff --git a/docs/img/graphql/manual/auth/auth-jwt-overview.png b/docs/img/graphql/core/auth/auth-jwt-overview.png
similarity index 100%
rename from docs/img/graphql/manual/auth/auth-jwt-overview.png
rename to docs/img/graphql/core/auth/auth-jwt-overview.png
diff --git a/docs/img/graphql/manual/auth/auth-webhook-overview.png b/docs/img/graphql/core/auth/auth-webhook-overview.png
similarity index 100%
rename from docs/img/graphql/manual/auth/auth-webhook-overview.png
rename to docs/img/graphql/core/auth/auth-webhook-overview.png
diff --git a/docs/img/graphql/manual/auth/author-insert-permissions.png b/docs/img/graphql/core/auth/author-insert-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/author-insert-permissions.png
rename to docs/img/graphql/core/auth/author-insert-permissions.png
diff --git a/docs/img/graphql/manual/auth/author-select-perms.png b/docs/img/graphql/core/auth/author-select-perms.png
similarity index 100%
rename from docs/img/graphql/manual/auth/author-select-perms.png
rename to docs/img/graphql/core/auth/author-select-perms.png
diff --git a/docs/img/graphql/manual/auth/author-table.png b/docs/img/graphql/core/auth/author-table.png
similarity index 100%
rename from docs/img/graphql/manual/auth/author-table.png
rename to docs/img/graphql/core/auth/author-table.png
diff --git a/docs/img/graphql/manual/auth/boolean-operators.png b/docs/img/graphql/core/auth/boolean-operators.png
similarity index 100%
rename from docs/img/graphql/manual/auth/boolean-operators.png
rename to docs/img/graphql/core/auth/boolean-operators.png
diff --git a/docs/img/graphql/manual/auth/collaborator-relationship.png b/docs/img/graphql/core/auth/collaborator-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/auth/collaborator-relationship.png
rename to docs/img/graphql/core/auth/collaborator-relationship.png
diff --git a/docs/img/graphql/manual/auth/column-level-permissions.png b/docs/img/graphql/core/auth/column-level-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/column-level-permissions.png
rename to docs/img/graphql/core/auth/column-level-permissions.png
diff --git a/docs/img/graphql/manual/auth/composite-boolean-expression.png b/docs/img/graphql/core/auth/composite-boolean-expression.png
similarity index 100%
rename from docs/img/graphql/manual/auth/composite-boolean-expression.png
rename to docs/img/graphql/core/auth/composite-boolean-expression.png
diff --git a/docs/img/graphql/manual/auth/dev-mode-auth.png b/docs/img/graphql/core/auth/dev-mode-auth.png
similarity index 100%
rename from docs/img/graphql/manual/auth/dev-mode-auth.png
rename to docs/img/graphql/core/auth/dev-mode-auth.png
diff --git a/docs/img/graphql/manual/auth/dev-mode-role-header-access-key.png b/docs/img/graphql/core/auth/dev-mode-role-header-access-key.png
similarity index 100%
rename from docs/img/graphql/manual/auth/dev-mode-role-header-access-key.png
rename to docs/img/graphql/core/auth/dev-mode-role-header-access-key.png
diff --git a/docs/img/graphql/manual/auth/dev-mode-role-header.png b/docs/img/graphql/core/auth/dev-mode-role-header.png
similarity index 100%
rename from docs/img/graphql/manual/auth/dev-mode-role-header.png
rename to docs/img/graphql/core/auth/dev-mode-role-header.png
diff --git a/docs/img/graphql/manual/auth/exists-permission-example.png b/docs/img/graphql/core/auth/exists-permission-example.png
similarity index 100%
rename from docs/img/graphql/manual/auth/exists-permission-example.png
rename to docs/img/graphql/core/auth/exists-permission-example.png
diff --git a/docs/img/graphql/manual/auth/fetch-authors.png b/docs/img/graphql/core/auth/fetch-authors.png
similarity index 100%
rename from docs/img/graphql/manual/auth/fetch-authors.png
rename to docs/img/graphql/core/auth/fetch-authors.png
diff --git a/docs/img/graphql/manual/auth/github-org-hierarchical-roles.png b/docs/img/graphql/core/auth/github-org-hierarchical-roles.png
similarity index 100%
rename from docs/img/graphql/manual/auth/github-org-hierarchical-roles.png
rename to docs/img/graphql/core/auth/github-org-hierarchical-roles.png
diff --git a/docs/img/graphql/manual/auth/hasura-perms.png b/docs/img/graphql/core/auth/hasura-perms.png
similarity index 100%
rename from docs/img/graphql/manual/auth/hasura-perms.png
rename to docs/img/graphql/core/auth/hasura-perms.png
diff --git a/docs/img/graphql/manual/auth/jwt-auth.png b/docs/img/graphql/core/auth/jwt-auth.png
similarity index 100%
rename from docs/img/graphql/manual/auth/jwt-auth.png
rename to docs/img/graphql/core/auth/jwt-auth.png
diff --git a/docs/img/graphql/manual/auth/jwt-config-generated.png b/docs/img/graphql/core/auth/jwt-config-generated.png
similarity index 100%
rename from docs/img/graphql/manual/auth/jwt-config-generated.png
rename to docs/img/graphql/core/auth/jwt-config-generated.png
diff --git a/docs/img/graphql/manual/auth/limit-results.png b/docs/img/graphql/core/auth/limit-results.png
similarity index 100%
rename from docs/img/graphql/manual/auth/limit-results.png
rename to docs/img/graphql/core/auth/limit-results.png
diff --git a/docs/img/graphql/manual/auth/limit-rows-for-select.png b/docs/img/graphql/core/auth/limit-rows-for-select.png
similarity index 100%
rename from docs/img/graphql/manual/auth/limit-rows-for-select.png
rename to docs/img/graphql/core/auth/limit-rows-for-select.png
diff --git a/docs/img/graphql/manual/auth/multiple-rules-create-manual-relationship.png b/docs/img/graphql/core/auth/multiple-rules-create-manual-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multiple-rules-create-manual-relationship.png
rename to docs/img/graphql/core/auth/multiple-rules-create-manual-relationship.png
diff --git a/docs/img/graphql/manual/auth/multiple-rules-define-private-permissions.png b/docs/img/graphql/core/auth/multiple-rules-define-private-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multiple-rules-define-private-permissions.png
rename to docs/img/graphql/core/auth/multiple-rules-define-private-permissions.png
diff --git a/docs/img/graphql/manual/auth/multiple-rules-define-public-permissions.png b/docs/img/graphql/core/auth/multiple-rules-define-public-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multiple-rules-define-public-permissions.png
rename to docs/img/graphql/core/auth/multiple-rules-define-public-permissions.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-author-insert.png b/docs/img/graphql/core/auth/multirole-example-author-insert.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-author-insert.png
rename to docs/img/graphql/core/auth/multirole-example-author-insert.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-author-select.png b/docs/img/graphql/core/auth/multirole-example-author-select.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-author-select.png
rename to docs/img/graphql/core/auth/multirole-example-author-select.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-db-schema.png b/docs/img/graphql/core/auth/multirole-example-db-schema.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-db-schema.png
rename to docs/img/graphql/core/auth/multirole-example-db-schema.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-editor-select.png b/docs/img/graphql/core/auth/multirole-example-editor-select.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-editor-select.png
rename to docs/img/graphql/core/auth/multirole-example-editor-select.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-editor-update.png b/docs/img/graphql/core/auth/multirole-example-editor-update.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-editor-update.png
rename to docs/img/graphql/core/auth/multirole-example-editor-update.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-reviewer-select.png b/docs/img/graphql/core/auth/multirole-example-reviewer-select.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-reviewer-select.png
rename to docs/img/graphql/core/auth/multirole-example-reviewer-select.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-reviewer-update.png b/docs/img/graphql/core/auth/multirole-example-reviewer-update.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-reviewer-update.png
rename to docs/img/graphql/core/auth/multirole-example-reviewer-update.png
diff --git a/docs/img/graphql/manual/auth/multirole-example-reviewers-array-relationship.png b/docs/img/graphql/core/auth/multirole-example-reviewers-array-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-example-reviewers-array-relationship.png
rename to docs/img/graphql/core/auth/multirole-example-reviewers-array-relationship.png
diff --git a/docs/img/graphql/manual/auth/multirole-setup.png b/docs/img/graphql/core/auth/multirole-setup.png
similarity index 100%
rename from docs/img/graphql/manual/auth/multirole-setup.png
rename to docs/img/graphql/core/auth/multirole-setup.png
diff --git a/docs/img/graphql/manual/auth/nested-object-permission-reviewer-role.png b/docs/img/graphql/core/auth/nested-object-permission-reviewer-role.png
similarity index 100%
rename from docs/img/graphql/manual/auth/nested-object-permission-reviewer-role.png
rename to docs/img/graphql/core/auth/nested-object-permission-reviewer-role.png
diff --git a/docs/img/graphql/manual/auth/nested-object-permission-simple-example.png b/docs/img/graphql/core/auth/nested-object-permission-simple-example.png
similarity index 100%
rename from docs/img/graphql/manual/auth/nested-object-permission-simple-example.png
rename to docs/img/graphql/core/auth/nested-object-permission-simple-example.png
diff --git a/docs/img/graphql/manual/auth/nested-object-permissions-rule.gif b/docs/img/graphql/core/auth/nested-object-permissions-rule.gif
similarity index 100%
rename from docs/img/graphql/manual/auth/nested-object-permissions-rule.gif
rename to docs/img/graphql/core/auth/nested-object-permissions-rule.gif
diff --git a/docs/img/graphql/manual/auth/operators-for-integer-types.png b/docs/img/graphql/core/auth/operators-for-integer-types.png
similarity index 100%
rename from docs/img/graphql/manual/auth/operators-for-integer-types.png
rename to docs/img/graphql/core/auth/operators-for-integer-types.png
diff --git a/docs/img/graphql/manual/auth/operators-for-text-types.png b/docs/img/graphql/core/auth/operators-for-text-types.png
similarity index 100%
rename from docs/img/graphql/manual/auth/operators-for-text-types.png
rename to docs/img/graphql/core/auth/operators-for-text-types.png
diff --git a/docs/img/graphql/manual/auth/org-manager-graphiql.png b/docs/img/graphql/core/auth/org-manager-graphiql.png
similarity index 100%
rename from docs/img/graphql/manual/auth/org-manager-graphiql.png
rename to docs/img/graphql/core/auth/org-manager-graphiql.png
diff --git a/docs/img/graphql/manual/auth/permission-basics-query-with-access-control.png b/docs/img/graphql/core/auth/permission-basics-query-with-access-control.png
similarity index 100%
rename from docs/img/graphql/manual/auth/permission-basics-query-with-access-control.png
rename to docs/img/graphql/core/auth/permission-basics-query-with-access-control.png
diff --git a/docs/img/graphql/manual/auth/permission-basics-simple-example.png b/docs/img/graphql/core/auth/permission-basics-simple-example.png
similarity index 100%
rename from docs/img/graphql/manual/auth/permission-basics-simple-example.png
rename to docs/img/graphql/core/auth/permission-basics-simple-example.png
diff --git a/docs/img/graphql/manual/auth/permission-rule-granularity.png b/docs/img/graphql/core/auth/permission-rule-granularity.png
similarity index 100%
rename from docs/img/graphql/manual/auth/permission-rule-granularity.png
rename to docs/img/graphql/core/auth/permission-rule-granularity.png
diff --git a/docs/img/graphql/manual/auth/permissions-rule-analogy.png b/docs/img/graphql/core/auth/permissions-rule-analogy.png
similarity index 100%
rename from docs/img/graphql/manual/auth/permissions-rule-analogy.png
rename to docs/img/graphql/core/auth/permissions-rule-analogy.png
diff --git a/docs/img/graphql/manual/auth/query-with-perms.png b/docs/img/graphql/core/auth/query-with-perms.png
similarity index 100%
rename from docs/img/graphql/manual/auth/query-with-perms.png
rename to docs/img/graphql/core/auth/query-with-perms.png
diff --git a/docs/img/graphql/manual/auth/restrict-columns.png b/docs/img/graphql/core/auth/restrict-columns.png
similarity index 100%
rename from docs/img/graphql/manual/auth/restrict-columns.png
rename to docs/img/graphql/core/auth/restrict-columns.png
diff --git a/docs/img/graphql/manual/auth/restricted-data-for-reviewer-role.png b/docs/img/graphql/core/auth/restricted-data-for-reviewer-role.png
similarity index 100%
rename from docs/img/graphql/manual/auth/restricted-data-for-reviewer-role.png
rename to docs/img/graphql/core/auth/restricted-data-for-reviewer-role.png
diff --git a/docs/img/graphql/manual/auth/restricted-data-for-role-reviewer.png b/docs/img/graphql/core/auth/restricted-data-for-role-reviewer.png
similarity index 100%
rename from docs/img/graphql/manual/auth/restricted-data-for-role-reviewer.png
rename to docs/img/graphql/core/auth/restricted-data-for-role-reviewer.png
diff --git a/docs/img/graphql/manual/auth/schema-for-nested-object-based-permissions.png b/docs/img/graphql/core/auth/schema-for-nested-object-based-permissions.png
similarity index 100%
rename from docs/img/graphql/manual/auth/schema-for-nested-object-based-permissions.png
rename to docs/img/graphql/core/auth/schema-for-nested-object-based-permissions.png
diff --git a/docs/img/graphql/manual/auth/session-variables-in-permissions-simple-example.png b/docs/img/graphql/core/auth/session-variables-in-permissions-simple-example.png
similarity index 100%
rename from docs/img/graphql/manual/auth/session-variables-in-permissions-simple-example.png
rename to docs/img/graphql/core/auth/session-variables-in-permissions-simple-example.png
diff --git a/docs/img/graphql/manual/auth/simple-boolean-expression.png b/docs/img/graphql/core/auth/simple-boolean-expression.png
similarity index 100%
rename from docs/img/graphql/manual/auth/simple-boolean-expression.png
rename to docs/img/graphql/core/auth/simple-boolean-expression.png
diff --git a/docs/img/graphql/manual/auth/unsuccessful-mutation-for-role-reviewer.png b/docs/img/graphql/core/auth/unsuccessful-mutation-for-role-reviewer.png
similarity index 100%
rename from docs/img/graphql/manual/auth/unsuccessful-mutation-for-role-reviewer.png
rename to docs/img/graphql/core/auth/unsuccessful-mutation-for-role-reviewer.png
diff --git a/docs/img/graphql/manual/auth/user-select-graphiql.png b/docs/img/graphql/core/auth/user-select-graphiql.png
similarity index 100%
rename from docs/img/graphql/manual/auth/user-select-graphiql.png
rename to docs/img/graphql/core/auth/user-select-graphiql.png
diff --git a/docs/img/graphql/manual/auth/webhook-auth.png b/docs/img/graphql/core/auth/webhook-auth.png
similarity index 100%
rename from docs/img/graphql/manual/auth/webhook-auth.png
rename to docs/img/graphql/core/auth/webhook-auth.png
diff --git a/docs/img/graphql/manual/business-logic/add-remote-schemas-interface.png b/docs/img/graphql/core/business-logic/add-remote-schemas-interface.png
similarity index 100%
rename from docs/img/graphql/manual/business-logic/add-remote-schemas-interface.png
rename to docs/img/graphql/core/business-logic/add-remote-schemas-interface.png
diff --git a/docs/img/graphql/manual/business-logic/custom-business-logic.png b/docs/img/graphql/core/business-logic/custom-business-logic.png
similarity index 100%
rename from docs/img/graphql/manual/business-logic/custom-business-logic.png
rename to docs/img/graphql/core/business-logic/custom-business-logic.png
diff --git a/docs/img/graphql/manual/business-logic/graphql-schema-stitching.png b/docs/img/graphql/core/business-logic/graphql-schema-stitching.png
similarity index 100%
rename from docs/img/graphql/manual/business-logic/graphql-schema-stitching.png
rename to docs/img/graphql/core/business-logic/graphql-schema-stitching.png
diff --git a/docs/img/graphql/manual/business-logic/using-custom-resolvers-and-stitching.png b/docs/img/graphql/core/business-logic/using-custom-resolvers-and-stitching.png
similarity index 100%
rename from docs/img/graphql/manual/business-logic/using-custom-resolvers-and-stitching.png
rename to docs/img/graphql/core/business-logic/using-custom-resolvers-and-stitching.png
diff --git a/docs/img/graphql/manual/deployment/access-key-console.png b/docs/img/graphql/core/deployment/access-key-console.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/access-key-console.png
rename to docs/img/graphql/core/deployment/access-key-console.png
diff --git a/docs/img/graphql/manual/deployment/deploy-to-render-hasura-header.png b/docs/img/graphql/core/deployment/deploy-to-render-hasura-header.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/deploy-to-render-hasura-header.png
rename to docs/img/graphql/core/deployment/deploy-to-render-hasura-header.png
diff --git a/docs/img/graphql/manual/deployment/deploy-to-render-hasura-iac.png b/docs/img/graphql/core/deployment/deploy-to-render-hasura-iac.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/deploy-to-render-hasura-iac.png
rename to docs/img/graphql/core/deployment/deploy-to-render-hasura-iac.png
diff --git a/docs/img/graphql/manual/deployment/heroku-database-url-access.png b/docs/img/graphql/core/deployment/heroku-database-url-access.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/heroku-database-url-access.png
rename to docs/img/graphql/core/deployment/heroku-database-url-access.png
diff --git a/docs/img/graphql/manual/deployment/remove-heroku-postgres-addon.png b/docs/img/graphql/core/deployment/remove-heroku-postgres-addon.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/remove-heroku-postgres-addon.png
rename to docs/img/graphql/core/deployment/remove-heroku-postgres-addon.png
diff --git a/docs/img/graphql/manual/deployment/schema_permissions_summary.png b/docs/img/graphql/core/deployment/schema_permissions_summary.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/schema_permissions_summary.png
rename to docs/img/graphql/core/deployment/schema_permissions_summary.png
diff --git a/docs/img/graphql/manual/deployment/secure-heroku.png b/docs/img/graphql/core/deployment/secure-heroku.png
similarity index 100%
rename from docs/img/graphql/manual/deployment/secure-heroku.png
rename to docs/img/graphql/core/deployment/secure-heroku.png
diff --git a/docs/img/graphql/manual/engine-internals/hdb_permission.jpg b/docs/img/graphql/core/engine-internals/hdb_permission.jpg
similarity index 100%
rename from docs/img/graphql/manual/engine-internals/hdb_permission.jpg
rename to docs/img/graphql/core/engine-internals/hdb_permission.jpg
diff --git a/docs/img/graphql/manual/engine-internals/hdb_relationship.jpg b/docs/img/graphql/core/engine-internals/hdb_relationship.jpg
similarity index 100%
rename from docs/img/graphql/manual/engine-internals/hdb_relationship.jpg
rename to docs/img/graphql/core/engine-internals/hdb_relationship.jpg
diff --git a/docs/img/graphql/manual/engine-internals/hdb_table.jpg b/docs/img/graphql/core/engine-internals/hdb_table.jpg
similarity index 100%
rename from docs/img/graphql/manual/engine-internals/hdb_table.jpg
rename to docs/img/graphql/core/engine-internals/hdb_table.jpg
diff --git a/docs/img/graphql/manual/event-triggers/advanced-cron.png b/docs/img/graphql/core/event-triggers/advanced-cron.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/advanced-cron.png
rename to docs/img/graphql/core/event-triggers/advanced-cron.png
diff --git a/docs/img/graphql/manual/event-triggers/advanced-one-off.png b/docs/img/graphql/core/event-triggers/advanced-one-off.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/advanced-one-off.png
rename to docs/img/graphql/core/event-triggers/advanced-one-off.png
diff --git a/docs/img/graphql/manual/event-triggers/create-cron.png b/docs/img/graphql/core/event-triggers/create-cron.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/create-cron.png
rename to docs/img/graphql/core/event-triggers/create-cron.png
diff --git a/docs/img/graphql/manual/event-triggers/create-event-trigger-advanced-settings.png b/docs/img/graphql/core/event-triggers/create-event-trigger-advanced-settings.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/create-event-trigger-advanced-settings.png
rename to docs/img/graphql/core/event-triggers/create-event-trigger-advanced-settings.png
diff --git a/docs/img/graphql/manual/event-triggers/create-event-trigger.png b/docs/img/graphql/core/event-triggers/create-event-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/create-event-trigger.png
rename to docs/img/graphql/core/event-triggers/create-event-trigger.png
diff --git a/docs/img/graphql/manual/event-triggers/data-triggers-arch.png b/docs/img/graphql/core/event-triggers/data-triggers-arch.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/data-triggers-arch.png
rename to docs/img/graphql/core/event-triggers/data-triggers-arch.png
diff --git a/docs/img/graphql/manual/event-triggers/define-cron-trigger.png b/docs/img/graphql/core/event-triggers/define-cron-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/define-cron-trigger.png
rename to docs/img/graphql/core/event-triggers/define-cron-trigger.png
diff --git a/docs/img/graphql/manual/event-triggers/define-one-off-event.png b/docs/img/graphql/core/event-triggers/define-one-off-event.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/define-one-off-event.png
rename to docs/img/graphql/core/event-triggers/define-one-off-event.png
diff --git a/docs/img/graphql/manual/event-triggers/one-off.png b/docs/img/graphql/core/event-triggers/one-off.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/one-off.png
rename to docs/img/graphql/core/event-triggers/one-off.png
diff --git a/docs/img/graphql/manual/event-triggers/pending-cron.png b/docs/img/graphql/core/event-triggers/pending-cron.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/pending-cron.png
rename to docs/img/graphql/core/event-triggers/pending-cron.png
diff --git a/docs/img/graphql/manual/event-triggers/pending-one-off.png b/docs/img/graphql/core/event-triggers/pending-one-off.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/pending-one-off.png
rename to docs/img/graphql/core/event-triggers/pending-one-off.png
diff --git a/docs/img/graphql/manual/event-triggers/run-manual-trigger.png b/docs/img/graphql/core/event-triggers/run-manual-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/run-manual-trigger.png
rename to docs/img/graphql/core/event-triggers/run-manual-trigger.png
diff --git a/docs/img/graphql/manual/event-triggers/select-manual-trigger.png b/docs/img/graphql/core/event-triggers/select-manual-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/event-triggers/select-manual-trigger.png
rename to docs/img/graphql/core/event-triggers/select-manual-trigger.png
diff --git a/docs/img/graphql/manual/getting-started/GraphQLAPI.jpg b/docs/img/graphql/core/getting-started/GraphQLAPI.jpg
similarity index 100%
rename from docs/img/graphql/manual/getting-started/GraphQLAPI.jpg
rename to docs/img/graphql/core/getting-started/GraphQLAPI.jpg
diff --git a/docs/img/graphql/manual/getting-started/InstallSuccess.jpg b/docs/img/graphql/core/getting-started/InstallSuccess.jpg
similarity index 100%
rename from docs/img/graphql/manual/getting-started/InstallSuccess.jpg
rename to docs/img/graphql/core/getting-started/InstallSuccess.jpg
diff --git a/docs/img/graphql/manual/getting-started/TableTracked.jpg b/docs/img/graphql/core/getting-started/TableTracked.jpg
similarity index 100%
rename from docs/img/graphql/manual/getting-started/TableTracked.jpg
rename to docs/img/graphql/core/getting-started/TableTracked.jpg
diff --git a/docs/img/graphql/manual/getting-started/TrackTable.jpg b/docs/img/graphql/core/getting-started/TrackTable.jpg
similarity index 100%
rename from docs/img/graphql/manual/getting-started/TrackTable.jpg
rename to docs/img/graphql/core/getting-started/TrackTable.jpg
diff --git a/docs/img/graphql/manual/getting-started/UntrackedTables.jpg b/docs/img/graphql/core/getting-started/UntrackedTables.jpg
similarity index 100%
rename from docs/img/graphql/manual/getting-started/UntrackedTables.jpg
rename to docs/img/graphql/core/getting-started/UntrackedTables.jpg
diff --git a/docs/img/graphql/manual/getting-started/console-local.png b/docs/img/graphql/core/getting-started/console-local.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/console-local.png
rename to docs/img/graphql/core/getting-started/console-local.png
diff --git a/docs/img/graphql/manual/getting-started/console.png b/docs/img/graphql/core/getting-started/console.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/console.png
rename to docs/img/graphql/core/getting-started/console.png
diff --git a/docs/img/graphql/manual/getting-started/create-event-trigger.png b/docs/img/graphql/core/getting-started/create-event-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/create-event-trigger.png
rename to docs/img/graphql/core/getting-started/create-event-trigger.png
diff --git a/docs/img/graphql/manual/getting-started/create-profile-table.png b/docs/img/graphql/core/getting-started/create-profile-table.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/create-profile-table.png
rename to docs/img/graphql/core/getting-started/create-profile-table.png
diff --git a/docs/img/graphql/manual/getting-started/hasura-graphql-console.png b/docs/img/graphql/core/getting-started/hasura-graphql-console.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/hasura-graphql-console.png
rename to docs/img/graphql/core/getting-started/hasura-graphql-console.png
diff --git a/docs/img/graphql/manual/getting-started/heroku-env.png b/docs/img/graphql/core/getting-started/heroku-env.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/heroku-env.png
rename to docs/img/graphql/core/getting-started/heroku-env.png
diff --git a/docs/img/graphql/manual/getting-started/profile-query.png b/docs/img/graphql/core/getting-started/profile-query.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/profile-query.png
rename to docs/img/graphql/core/getting-started/profile-query.png
diff --git a/docs/img/graphql/manual/getting-started/running-hasura.png b/docs/img/graphql/core/getting-started/running-hasura.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/running-hasura.png
rename to docs/img/graphql/core/getting-started/running-hasura.png
diff --git a/docs/img/graphql/manual/getting-started/trigger-details.png b/docs/img/graphql/core/getting-started/trigger-details.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/trigger-details.png
rename to docs/img/graphql/core/getting-started/trigger-details.png
diff --git a/docs/img/graphql/manual/getting-started/trigger-events.png b/docs/img/graphql/core/getting-started/trigger-events.png
similarity index 100%
rename from docs/img/graphql/manual/getting-started/trigger-events.png
rename to docs/img/graphql/core/getting-started/trigger-events.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-additional-role.png b/docs/img/graphql/core/guides/auth-guardian-additional-role.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-additional-role.png
rename to docs/img/graphql/core/guides/auth-guardian-additional-role.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-config-generator.png b/docs/img/graphql/core/guides/auth-guardian-config-generator.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-config-generator.png
rename to docs/img/graphql/core/guides/auth-guardian-config-generator.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-default-role.png b/docs/img/graphql/core/guides/auth-guardian-default-role.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-default-role.png
rename to docs/img/graphql/core/guides/auth-guardian-default-role.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-generate-test-jwt.png b/docs/img/graphql/core/guides/auth-guardian-generate-test-jwt.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-generate-test-jwt.png
rename to docs/img/graphql/core/guides/auth-guardian-generate-test-jwt.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-session-variable.png b/docs/img/graphql/core/guides/auth-guardian-session-variable.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-session-variable.png
rename to docs/img/graphql/core/guides/auth-guardian-session-variable.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-test-jwt.png b/docs/img/graphql/core/guides/auth-guardian-test-jwt.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-test-jwt.png
rename to docs/img/graphql/core/guides/auth-guardian-test-jwt.png
diff --git a/docs/img/graphql/manual/guides/auth-guardian-user-id.png b/docs/img/graphql/core/guides/auth-guardian-user-id.png
similarity index 100%
rename from docs/img/graphql/manual/guides/auth-guardian-user-id.png
rename to docs/img/graphql/core/guides/auth-guardian-user-id.png
diff --git a/docs/img/graphql/manual/guides/cognito-app-client-settings.png b/docs/img/graphql/core/guides/cognito-app-client-settings.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-app-client-settings.png
rename to docs/img/graphql/core/guides/cognito-app-client-settings.png
diff --git a/docs/img/graphql/manual/guides/cognito-jwt.png b/docs/img/graphql/core/guides/cognito-jwt.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-jwt.png
rename to docs/img/graphql/core/guides/cognito-jwt.png
diff --git a/docs/img/graphql/manual/guides/cognito-lambda.png b/docs/img/graphql/core/guides/cognito-lambda.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-lambda.png
rename to docs/img/graphql/core/guides/cognito-lambda.png
diff --git a/docs/img/graphql/manual/guides/cognito-launch-hosted-ui.png b/docs/img/graphql/core/guides/cognito-launch-hosted-ui.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-launch-hosted-ui.png
rename to docs/img/graphql/core/guides/cognito-launch-hosted-ui.png
diff --git a/docs/img/graphql/manual/guides/cognito-login.png b/docs/img/graphql/core/guides/cognito-login.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-login.png
rename to docs/img/graphql/core/guides/cognito-login.png
diff --git a/docs/img/graphql/manual/guides/cognito-redirect.png b/docs/img/graphql/core/guides/cognito-redirect.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-redirect.png
rename to docs/img/graphql/core/guides/cognito-redirect.png
diff --git a/docs/img/graphql/manual/guides/cognito-triggers-1.png b/docs/img/graphql/core/guides/cognito-triggers-1.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-triggers-1.png
rename to docs/img/graphql/core/guides/cognito-triggers-1.png
diff --git a/docs/img/graphql/manual/guides/cognito-triggers-2.png b/docs/img/graphql/core/guides/cognito-triggers-2.png
similarity index 100%
rename from docs/img/graphql/manual/guides/cognito-triggers-2.png
rename to docs/img/graphql/core/guides/cognito-triggers-2.png
diff --git a/docs/img/graphql/manual/guides/create-client-popup.png b/docs/img/graphql/core/guides/create-client-popup.png
similarity index 100%
rename from docs/img/graphql/manual/guides/create-client-popup.png
rename to docs/img/graphql/core/guides/create-client-popup.png
diff --git a/docs/img/graphql/manual/guides/heroku-app-deployed.png b/docs/img/graphql/core/guides/heroku-app-deployed.png
similarity index 100%
rename from docs/img/graphql/manual/guides/heroku-app-deployed.png
rename to docs/img/graphql/core/guides/heroku-app-deployed.png
diff --git a/docs/img/graphql/manual/guides/heroku-app.png b/docs/img/graphql/core/guides/heroku-app.png
similarity index 100%
rename from docs/img/graphql/manual/guides/heroku-app.png
rename to docs/img/graphql/core/guides/heroku-app.png
diff --git a/docs/img/graphql/manual/guides/soft-deletes-delete-perms.png b/docs/img/graphql/core/guides/soft-deletes-delete-perms.png
similarity index 100%
rename from docs/img/graphql/manual/guides/soft-deletes-delete-perms.png
rename to docs/img/graphql/core/guides/soft-deletes-delete-perms.png
diff --git a/docs/img/graphql/manual/guides/soft-deletes-example-data.png b/docs/img/graphql/core/guides/soft-deletes-example-data.png
similarity index 100%
rename from docs/img/graphql/manual/guides/soft-deletes-example-data.png
rename to docs/img/graphql/core/guides/soft-deletes-example-data.png
diff --git a/docs/img/graphql/manual/guides/soft-deletes-insert-perms.png b/docs/img/graphql/core/guides/soft-deletes-insert-perms.png
similarity index 100%
rename from docs/img/graphql/manual/guides/soft-deletes-insert-perms.png
rename to docs/img/graphql/core/guides/soft-deletes-insert-perms.png
diff --git a/docs/img/graphql/manual/guides/soft-deletes-select-perms.png b/docs/img/graphql/core/guides/soft-deletes-select-perms.png
similarity index 100%
rename from docs/img/graphql/manual/guides/soft-deletes-select-perms.png
rename to docs/img/graphql/core/guides/soft-deletes-select-perms.png
diff --git a/docs/img/graphql/manual/guides/soft-deletes-update-perms.png b/docs/img/graphql/core/guides/soft-deletes-update-perms.png
similarity index 100%
rename from docs/img/graphql/manual/guides/soft-deletes-update-perms.png
rename to docs/img/graphql/core/guides/soft-deletes-update-perms.png
diff --git a/docs/img/graphql/manual/migrations/tracked-tables.png b/docs/img/graphql/core/migrations/tracked-tables.png
similarity index 100%
rename from docs/img/graphql/manual/migrations/tracked-tables.png
rename to docs/img/graphql/core/migrations/tracked-tables.png
diff --git a/docs/img/graphql/manual/queries/analyze-query.png b/docs/img/graphql/core/queries/analyze-query.png
similarity index 100%
rename from docs/img/graphql/manual/queries/analyze-query.png
rename to docs/img/graphql/core/queries/analyze-query.png
diff --git a/docs/img/graphql/manual/queries/query-analysis-after-index.png b/docs/img/graphql/core/queries/query-analysis-after-index.png
similarity index 100%
rename from docs/img/graphql/manual/queries/query-analysis-after-index.png
rename to docs/img/graphql/core/queries/query-analysis-after-index.png
diff --git a/docs/img/graphql/manual/queries/query-analysis-before-index.png b/docs/img/graphql/core/queries/query-analysis-before-index.png
similarity index 100%
rename from docs/img/graphql/manual/queries/query-analysis-before-index.png
rename to docs/img/graphql/core/queries/query-analysis-before-index.png
diff --git a/docs/img/graphql/manual/queries/query-execution-plan-after-index.png b/docs/img/graphql/core/queries/query-execution-plan-after-index.png
similarity index 100%
rename from docs/img/graphql/manual/queries/query-execution-plan-after-index.png
rename to docs/img/graphql/core/queries/query-execution-plan-after-index.png
diff --git a/docs/img/graphql/manual/queries/query-execution-plan.png b/docs/img/graphql/core/queries/query-execution-plan.png
similarity index 100%
rename from docs/img/graphql/manual/queries/query-execution-plan.png
rename to docs/img/graphql/core/queries/query-execution-plan.png
diff --git a/docs/img/graphql/manual/remote-joins/action-rel.png b/docs/img/graphql/core/remote-joins/action-rel.png
similarity index 100%
rename from docs/img/graphql/manual/remote-joins/action-rel.png
rename to docs/img/graphql/core/remote-joins/action-rel.png
diff --git a/docs/img/graphql/manual/remote-joins/add.png b/docs/img/graphql/core/remote-joins/add.png
similarity index 100%
rename from docs/img/graphql/manual/remote-joins/add.png
rename to docs/img/graphql/core/remote-joins/add.png
diff --git a/docs/img/graphql/manual/remote-joins/define-action-rel.png b/docs/img/graphql/core/remote-joins/define-action-rel.png
similarity index 100%
rename from docs/img/graphql/manual/remote-joins/define-action-rel.png
rename to docs/img/graphql/core/remote-joins/define-action-rel.png
diff --git a/docs/img/graphql/manual/remote-joins/define.png b/docs/img/graphql/core/remote-joins/define.png
similarity index 100%
rename from docs/img/graphql/manual/remote-joins/define.png
rename to docs/img/graphql/core/remote-joins/define.png
diff --git a/docs/img/graphql/manual/remote-schemas/remote-schema-arch.png b/docs/img/graphql/core/remote-schemas/remote-schema-arch.png
similarity index 100%
rename from docs/img/graphql/manual/remote-schemas/remote-schema-arch.png
rename to docs/img/graphql/core/remote-schemas/remote-schema-arch.png
diff --git a/docs/img/graphql/manual/scheduled-triggers/scheduled-trigger-arch.png b/docs/img/graphql/core/scheduled-triggers/scheduled-trigger-arch.png
similarity index 100%
rename from docs/img/graphql/manual/scheduled-triggers/scheduled-trigger-arch.png
rename to docs/img/graphql/core/scheduled-triggers/scheduled-trigger-arch.png
diff --git a/docs/img/graphql/manual/schema/add-1-1-relationship.png b/docs/img/graphql/core/schema/add-1-1-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/schema/add-1-1-relationship.png
rename to docs/img/graphql/core/schema/add-1-1-relationship.png
diff --git a/docs/img/graphql/manual/schema/add-1-many-relationship.png b/docs/img/graphql/core/schema/add-1-many-relationship.png
similarity index 100%
rename from docs/img/graphql/manual/schema/add-1-many-relationship.png
rename to docs/img/graphql/core/schema/add-1-many-relationship.png
diff --git a/docs/img/graphql/manual/schema/add-default-value.png b/docs/img/graphql/core/schema/add-default-value.png
similarity index 100%
rename from docs/img/graphql/manual/schema/add-default-value.png
rename to docs/img/graphql/core/schema/add-default-value.png
diff --git a/docs/img/graphql/manual/schema/add-foreign-key.png b/docs/img/graphql/core/schema/add-foreign-key.png
similarity index 100%
rename from docs/img/graphql/manual/schema/add-foreign-key.png
rename to docs/img/graphql/core/schema/add-foreign-key.png
diff --git a/docs/img/graphql/manual/schema/column-preset-mutation-result.png b/docs/img/graphql/core/schema/column-preset-mutation-result.png
similarity index 100%
rename from docs/img/graphql/manual/schema/column-preset-mutation-result.png
rename to docs/img/graphql/core/schema/column-preset-mutation-result.png
diff --git a/docs/img/graphql/manual/schema/column-preset-schema-change-for-role.png b/docs/img/graphql/core/schema/column-preset-schema-change-for-role.png
similarity index 100%
rename from docs/img/graphql/manual/schema/column-preset-schema-change-for-role.png
rename to docs/img/graphql/core/schema/column-preset-schema-change-for-role.png
diff --git a/docs/img/graphql/manual/schema/column-presets-option.png b/docs/img/graphql/core/schema/column-presets-option.png
similarity index 100%
rename from docs/img/graphql/manual/schema/column-presets-option.png
rename to docs/img/graphql/core/schema/column-presets-option.png
diff --git a/docs/img/graphql/manual/schema/column-presets-value-options.png b/docs/img/graphql/core/schema/column-presets-value-options.png
similarity index 100%
rename from docs/img/graphql/manual/schema/column-presets-value-options.png
rename to docs/img/graphql/core/schema/column-presets-value-options.png
diff --git a/docs/img/graphql/manual/schema/computed-field-create.png b/docs/img/graphql/core/schema/computed-field-create.png
similarity index 100%
rename from docs/img/graphql/manual/schema/computed-field-create.png
rename to docs/img/graphql/core/schema/computed-field-create.png
diff --git a/docs/img/graphql/manual/schema/create-sql-fn-table.png b/docs/img/graphql/core/schema/create-sql-fn-table.png
similarity index 100%
rename from docs/img/graphql/manual/schema/create-sql-fn-table.png
rename to docs/img/graphql/core/schema/create-sql-fn-table.png
diff --git a/docs/img/graphql/manual/schema/create-table-graphql.png b/docs/img/graphql/core/schema/create-table-graphql.png
similarity index 100%
rename from docs/img/graphql/manual/schema/create-table-graphql.png
rename to docs/img/graphql/core/schema/create-table-graphql.png
diff --git a/docs/img/graphql/manual/schema/create-trigger.png b/docs/img/graphql/core/schema/create-trigger.png
similarity index 100%
rename from docs/img/graphql/manual/schema/create-trigger.png
rename to docs/img/graphql/core/schema/create-trigger.png
diff --git a/docs/img/graphql/manual/schema/created-at.png b/docs/img/graphql/core/schema/created-at.png
similarity index 100%
rename from docs/img/graphql/manual/schema/created-at.png
rename to docs/img/graphql/core/schema/created-at.png
diff --git a/docs/img/graphql/manual/schema/custom-field-name-column.png b/docs/img/graphql/core/schema/custom-field-name-column.png
similarity index 100%
rename from docs/img/graphql/manual/schema/custom-field-name-column.png
rename to docs/img/graphql/core/schema/custom-field-name-column.png
diff --git a/docs/img/graphql/manual/schema/custom-field-name-root-fields.png b/docs/img/graphql/core/schema/custom-field-name-root-fields.png
similarity index 100%
rename from docs/img/graphql/manual/schema/custom-field-name-root-fields.png
rename to docs/img/graphql/core/schema/custom-field-name-root-fields.png
diff --git a/docs/img/graphql/manual/schema/diagram-actions-data-validation.png b/docs/img/graphql/core/schema/diagram-actions-data-validation.png
similarity index 100%
rename from docs/img/graphql/manual/schema/diagram-actions-data-validation.png
rename to docs/img/graphql/core/schema/diagram-actions-data-validation.png
diff --git a/docs/img/graphql/manual/schema/enum-create-ref-table.png b/docs/img/graphql/core/schema/enum-create-ref-table.png
similarity index 100%
rename from docs/img/graphql/manual/schema/enum-create-ref-table.png
rename to docs/img/graphql/core/schema/enum-create-ref-table.png
diff --git a/docs/img/graphql/manual/schema/enum-insert-ref-values.png b/docs/img/graphql/core/schema/enum-insert-ref-values.png
similarity index 100%
rename from docs/img/graphql/manual/schema/enum-insert-ref-values.png
rename to docs/img/graphql/core/schema/enum-insert-ref-values.png
diff --git a/docs/img/graphql/manual/schema/enum-set-foreign-key.png b/docs/img/graphql/core/schema/enum-set-foreign-key.png
similarity index 100%
rename from docs/img/graphql/manual/schema/enum-set-foreign-key.png
rename to docs/img/graphql/core/schema/enum-set-foreign-key.png
diff --git a/docs/img/graphql/manual/schema/enum-set.png b/docs/img/graphql/core/schema/enum-set.png
similarity index 100%
rename from docs/img/graphql/manual/schema/enum-set.png
rename to docs/img/graphql/core/schema/enum-set.png
diff --git a/docs/img/graphql/manual/schema/manual-relationship-btn.png b/docs/img/graphql/core/schema/manual-relationship-btn.png
similarity index 100%
rename from docs/img/graphql/manual/schema/manual-relationship-btn.png
rename to docs/img/graphql/core/schema/manual-relationship-btn.png
diff --git a/docs/img/graphql/manual/schema/manual-relationship-create.png b/docs/img/graphql/core/schema/manual-relationship-create.png
similarity index 100%
rename from docs/img/graphql/manual/schema/manual-relationship-create.png
rename to docs/img/graphql/core/schema/manual-relationship-create.png
diff --git a/docs/img/graphql/manual/schema/modify-sql-fn-table.png b/docs/img/graphql/core/schema/modify-sql-fn-table.png
similarity index 100%
rename from docs/img/graphql/manual/schema/modify-sql-fn-table.png
rename to docs/img/graphql/core/schema/modify-sql-fn-table.png
diff --git a/docs/img/graphql/manual/schema/relay.png b/docs/img/graphql/core/schema/relay.png
similarity index 100%
rename from docs/img/graphql/manual/schema/relay.png
rename to docs/img/graphql/core/schema/relay.png
diff --git a/docs/img/graphql/manual/schema/schema-stitching-v1-arch-diagram.png b/docs/img/graphql/core/schema/schema-stitching-v1-arch-diagram.png
similarity index 100%
rename from docs/img/graphql/manual/schema/schema-stitching-v1-arch-diagram.png
rename to docs/img/graphql/core/schema/schema-stitching-v1-arch-diagram.png
diff --git a/docs/img/graphql/manual/schema/updated-at.png b/docs/img/graphql/core/schema/updated-at.png
similarity index 100%
rename from docs/img/graphql/manual/schema/updated-at.png
rename to docs/img/graphql/core/schema/updated-at.png
diff --git a/docs/img/graphql/manual/schema/validation-actions-def.png b/docs/img/graphql/core/schema/validation-actions-def.png
similarity index 100%
rename from docs/img/graphql/manual/schema/validation-actions-def.png
rename to docs/img/graphql/core/schema/validation-actions-def.png
diff --git a/docs/img/graphql/manual/schema/validation-add-check-constraint.png b/docs/img/graphql/core/schema/validation-add-check-constraint.png
similarity index 100%
rename from docs/img/graphql/manual/schema/validation-add-check-constraint.png
rename to docs/img/graphql/core/schema/validation-add-check-constraint.png
diff --git a/docs/img/graphql/manual/schema/validation-author-isactive.png b/docs/img/graphql/core/schema/validation-author-isactive.png
similarity index 100%
rename from docs/img/graphql/manual/schema/validation-author-isactive.png
rename to docs/img/graphql/core/schema/validation-author-isactive.png
diff --git a/docs/img/graphql/manual/schema/validation-not-empty.png b/docs/img/graphql/core/schema/validation-not-empty.png
similarity index 100%
rename from docs/img/graphql/manual/schema/validation-not-empty.png
rename to docs/img/graphql/core/schema/validation-not-empty.png
diff --git a/docs/img/graphql/manual/troubleshooting/author_article.jpg b/docs/img/graphql/core/troubleshooting/author_article.jpg
similarity index 100%
rename from docs/img/graphql/manual/troubleshooting/author_article.jpg
rename to docs/img/graphql/core/troubleshooting/author_article.jpg
diff --git a/docs/index.rst b/docs/index.rst
index 46a11c6560ef4..b20fa5badd6a0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -17,10 +17,10 @@ Table of Contents
   :maxdepth: 2
   :titlesonly:
 
-  Hasura GraphQL Engine <graphql/manual/index>
+  Hasura GraphQL Engine <graphql/core/index>
 
 .. toctree::
   :maxdepth: 2
   :titlesonly:
 
-  Hasura Cloud <cloud/index>
+  Hasura Cloud <graphql/cloud/index>