Hi @ismaelhenzel,

In terms of your first question, Terraform automatically loads all *.tf files in the same directory, so it’s common practice to organise them by concern. For example,

envs/
  prod/
    backend.tf          # remote state config
    providers.tf        # databricks + cloud providers
    versions.tf
    locals.tf
    clusters.tf         # cluster + pools modules
    sql_warehouses.tf
    cluster_policies.tf
    secrets.tf

For the other question, it’s reasonable (and often desirable) to move Unity Catalog resources (metastore, catalogs, schemas, external locations, storage credentials, grants) into their own state once things grow. UC is a governance/metastore concern, often owned by a different team and with a different change cadence than compute. In the same link I shared above for your first question, you will see that the guidance explicitly calls out Unity Catalog resources as their own deployment pattern alongside account‑level infrastructure and workspace‑level configuration. You can also see that the official UC Terraform guides article shows UC as a coherent unit (metastore, external locations, catalogues, schemas, grants) managed via the Databricks provider, which maps nicely to its own state file/project.