diff --git a/src/Auth0.ManagementApi/Models/Branding.cs b/src/Auth0.ManagementApi/Models/Branding/Branding.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Branding.cs
rename to src/Auth0.ManagementApi/Models/Branding/Branding.cs
diff --git a/src/Auth0.ManagementApi/Models/BrandingBase.cs b/src/Auth0.ManagementApi/Models/Branding/BrandingBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/BrandingBase.cs
rename to src/Auth0.ManagementApi/Models/Branding/BrandingBase.cs
diff --git a/src/Auth0.ManagementApi/Models/BrandingColors.cs b/src/Auth0.ManagementApi/Models/Branding/BrandingColors.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/BrandingColors.cs
rename to src/Auth0.ManagementApi/Models/Branding/BrandingColors.cs
diff --git a/src/Auth0.ManagementApi/Models/BrandingFont.cs b/src/Auth0.ManagementApi/Models/Branding/BrandingFont.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/BrandingFont.cs
rename to src/Auth0.ManagementApi/Models/Branding/BrandingFont.cs
diff --git a/src/Auth0.ManagementApi/Models/BrandingUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Branding/BrandingUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/BrandingUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Branding/BrandingUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/Addons.cs b/src/Auth0.ManagementApi/Models/Client/Addons.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Addons.cs
rename to src/Auth0.ManagementApi/Models/Client/Addons.cs
diff --git a/src/Auth0.ManagementApi/Models/Client.cs b/src/Auth0.ManagementApi/Models/Client/Client.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Client.cs
rename to src/Auth0.ManagementApi/Models/Client/Client.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientApplicationType.cs b/src/Auth0.ManagementApi/Models/Client/ClientApplicationType.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientApplicationType.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientApplicationType.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientBase.cs b/src/Auth0.ManagementApi/Models/Client/ClientBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientBase.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientBase.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientCreateRequest.cs b/src/Auth0.ManagementApi/Models/Client/ClientCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientCredentialCreateRequest.cs b/src/Auth0.ManagementApi/Models/Client/ClientCredentialCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientCredentialCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientCredentialCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientCredentialUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Client/ClientCredentialUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientCredentialUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientCredentialUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientResourceServerAssociation.cs b/src/Auth0.ManagementApi/Models/Client/ClientResourceServerAssociation.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientResourceServerAssociation.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientResourceServerAssociation.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Client/ClientUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Client/ClientUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetClientsRequest.cs b/src/Auth0.ManagementApi/Models/Client/GetClientsRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetClientsRequest.cs
rename to src/Auth0.ManagementApi/Models/Client/GetClientsRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/RefreshToken.cs b/src/Auth0.ManagementApi/Models/Client/RefreshToken.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RefreshToken.cs
rename to src/Auth0.ManagementApi/Models/Client/RefreshToken.cs
diff --git a/src/Auth0.ManagementApi/Models/RefreshTokenExpirationType.cs b/src/Auth0.ManagementApi/Models/Client/RefreshTokenExpirationType.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RefreshTokenExpirationType.cs
rename to src/Auth0.ManagementApi/Models/Client/RefreshTokenExpirationType.cs
diff --git a/src/Auth0.ManagementApi/Models/RefreshTokenRotationType.cs b/src/Auth0.ManagementApi/Models/Client/RefreshTokenRotationType.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RefreshTokenRotationType.cs
rename to src/Auth0.ManagementApi/Models/Client/RefreshTokenRotationType.cs
diff --git a/src/Auth0.ManagementApi/Models/TokenEndpointAuthMethod.cs b/src/Auth0.ManagementApi/Models/Client/TokenEndpointAuthMethod.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TokenEndpointAuthMethod.cs
rename to src/Auth0.ManagementApi/Models/Client/TokenEndpointAuthMethod.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientGrant.cs b/src/Auth0.ManagementApi/Models/ClientGrants/ClientGrant.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientGrant.cs
rename to src/Auth0.ManagementApi/Models/ClientGrants/ClientGrant.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientGrantBase.cs b/src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientGrantBase.cs
rename to src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantBase.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientGrantCreateRequest.cs b/src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientGrantCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ClientGrantUpdateRequest.cs b/src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ClientGrantUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/ClientGrants/ClientGrantUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetClientGrantsRequest.cs b/src/Auth0.ManagementApi/Models/ClientGrants/GetClientGrantsRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetClientGrantsRequest.cs
rename to src/Auth0.ManagementApi/Models/ClientGrants/GetClientGrantsRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/Connection.cs b/src/Auth0.ManagementApi/Models/Connection/Connection.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Connection.cs
rename to src/Auth0.ManagementApi/Models/Connection/Connection.cs
diff --git a/src/Auth0.ManagementApi/Models/ConnectionBase.cs b/src/Auth0.ManagementApi/Models/Connection/ConnectionBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ConnectionBase.cs
rename to src/Auth0.ManagementApi/Models/Connection/ConnectionBase.cs
diff --git a/src/Auth0.ManagementApi/Models/ConnectionCreateRequest.cs b/src/Auth0.ManagementApi/Models/Connection/ConnectionCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ConnectionCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Connection/ConnectionCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ConnectionUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Connection/ConnectionUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ConnectionUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Connection/ConnectionUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetConnectionsRequest.cs b/src/Auth0.ManagementApi/Models/Connection/GetConnectionsRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetConnectionsRequest.cs
rename to src/Auth0.ManagementApi/Models/Connection/GetConnectionsRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomain.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomain.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomain.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomain.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainBase.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainBase.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainBase.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainCertificateProvisioning.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainCertificateProvisioning.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainCertificateProvisioning.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainCertificateProvisioning.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainCreateRequest.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainStatus.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainStatus.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainStatus.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainStatus.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainVerification.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerification.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainVerification.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerification.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainVerificationMethod.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerificationMethod.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainVerificationMethod.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerificationMethod.cs
diff --git a/src/Auth0.ManagementApi/Models/CustomDomainVerificationResponse.cs b/src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerificationResponse.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CustomDomainVerificationResponse.cs
rename to src/Auth0.ManagementApi/Models/CustomDomain/CustomDomainVerificationResponse.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailProvider.cs b/src/Auth0.ManagementApi/Models/EmailProvider/EmailProvider.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailProvider.cs
rename to src/Auth0.ManagementApi/Models/EmailProvider/EmailProvider.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailProviderBase.cs b/src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailProviderBase.cs
rename to src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderBase.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailProviderConfigureRequest.cs b/src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderConfigureRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailProviderConfigureRequest.cs
rename to src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderConfigureRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailProviderCredentials.cs b/src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderCredentials.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailProviderCredentials.cs
rename to src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderCredentials.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailProviderUpdateRequest.cs b/src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailProviderUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/EmailProvider/EmailProviderUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplate.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplate.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplate.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplate.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplateBase.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplateBase.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateBase.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplateCreateRequest.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplateCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplateName.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateName.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplateName.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateName.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplatePatchRequest.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplatePatchRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplatePatchRequest.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplatePatchRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplateSyntax.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateSyntax.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplateSyntax.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateSyntax.cs
diff --git a/src/Auth0.ManagementApi/Models/EmailTemplateUpdateRequest.cs b/src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/EmailTemplateUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/EmailTemplate/EmailTemplateUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/CreateGuardianEnrollmentTicketRequest.cs b/src/Auth0.ManagementApi/Models/Guardian/CreateGuardianEnrollmentTicketRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CreateGuardianEnrollmentTicketRequest.cs
rename to src/Auth0.ManagementApi/Models/Guardian/CreateGuardianEnrollmentTicketRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/CreateGuardianEnrollmentTicketResponse.cs b/src/Auth0.ManagementApi/Models/Guardian/CreateGuardianEnrollmentTicketResponse.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/CreateGuardianEnrollmentTicketResponse.cs
rename to src/Auth0.ManagementApi/Models/Guardian/CreateGuardianEnrollmentTicketResponse.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianEnrollment.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianEnrollment.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianEnrollment.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianEnrollment.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianEnrollmentStatus.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianEnrollmentStatus.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianEnrollmentStatus.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianEnrollmentStatus.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianFactor.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianFactor.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianFactor.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianFactor.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianFactorName.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianFactorName.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianFactorName.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianFactorName.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianPhoneMessageTypes.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianPhoneMessageTypes.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianPhoneMessageTypes.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianPhoneMessageTypes.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianSmsEnrollmentTemplates.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianSmsEnrollmentTemplates.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianSmsEnrollmentTemplates.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianSmsEnrollmentTemplates.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianSnsConfiguration.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianSnsConfiguration.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianSnsConfiguration.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianSnsConfiguration.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianSnsConfigurationBase.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianSnsConfigurationBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianSnsConfigurationBase.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianSnsConfigurationBase.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianTwilioConfiguration.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioConfiguration.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianTwilioConfiguration.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioConfiguration.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianTwilioConfigurationBase.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioConfigurationBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianTwilioConfigurationBase.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioConfigurationBase.cs
diff --git a/src/Auth0.ManagementApi/Models/GuardianTwilioProviderConfigurationUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioProviderConfigurationUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GuardianTwilioProviderConfigurationUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Guardian/GuardianTwilioProviderConfigurationUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/UpdateGuardianFactorBase.cs b/src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UpdateGuardianFactorBase.cs
rename to src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorBase.cs
diff --git a/src/Auth0.ManagementApi/Models/UpdateGuardianFactorRequest.cs b/src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UpdateGuardianFactorRequest.cs
rename to src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/UpdateGuardianFactorResponse.cs b/src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorResponse.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UpdateGuardianFactorResponse.cs
rename to src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianFactorResponse.cs
diff --git a/src/Auth0.ManagementApi/Models/UpdateGuardianSnsConfigurationRequest.cs b/src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianSnsConfigurationRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UpdateGuardianSnsConfigurationRequest.cs
rename to src/Auth0.ManagementApi/Models/Guardian/UpdateGuardianSnsConfigurationRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStream.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStream.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStream.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStream.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamBase.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamBase.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamBase.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamCreateRequest.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamStatus.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamStatus.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamStatus.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamStatus.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamType.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamType.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamType.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamType.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamUpdateRequest.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/LogStreamUpdateStatus.cs b/src/Auth0.ManagementApi/Models/LogStream/LogStreamUpdateStatus.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/LogStreamUpdateStatus.cs
rename to src/Auth0.ManagementApi/Models/LogStream/LogStreamUpdateStatus.cs
diff --git a/src/Auth0.ManagementApi/Models/DefaultOrganization.cs b/src/Auth0.ManagementApi/Models/Organization/DefaultOrganization.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/DefaultOrganization.cs
rename to src/Auth0.ManagementApi/Models/Organization/DefaultOrganization.cs
diff --git a/src/Auth0.ManagementApi/Models/Organization.cs b/src/Auth0.ManagementApi/Models/Organization/Organization.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Organization.cs
rename to src/Auth0.ManagementApi/Models/Organization/Organization.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationAddMemberRolesRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationAddMemberRolesRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationAddMemberRolesRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationAddMemberRolesRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationAddMembersRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationAddMembersRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationAddMembersRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationAddMembersRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationBase.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationBase.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationBase.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationBranding.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationBranding.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationBranding.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationBranding.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationClientGrant.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationClientGrant.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationClientGrant.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationClientGrant.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationConnection.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationConnection.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationConnection.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationConnection.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationConnectionCreateRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationConnectionCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationConnectionInfo.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionInfo.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationConnectionInfo.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionInfo.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationConnectionUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationConnectionUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationConnectionUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationCreateClientGrantRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationCreateClientGrantRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationCreateClientGrantRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationCreateClientGrantRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationCreateInvitationRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationCreateInvitationRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationCreateInvitationRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationCreateInvitationRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationCreateRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationDeleteMemberRolesRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationDeleteMemberRolesRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationDeleteMemberRolesRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationDeleteMemberRolesRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationDeleteMembersRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationDeleteMembersRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationDeleteMembersRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationDeleteMembersRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationGetAllMembersRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationGetAllMembersRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationGetAllMembersRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationGetAllMembersRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationGetAllRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationGetAllRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationGetAllRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationGetAllRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationGetClientGrantsRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationGetClientGrantsRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationGetClientGrantsRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationGetClientGrantsRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationGetInvitationRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationGetInvitationRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationGetInvitationRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationGetInvitationRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationInvitation.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationInvitation.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationInvitation.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationInvitation.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationInvitationInvitee.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationInvitationInvitee.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationInvitationInvitee.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationInvitationInvitee.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationInvitationInviter.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationInvitationInviter.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationInvitationInviter.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationInvitationInviter.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationMember.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationMember.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationMember.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationMember.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationRequireBehavior.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationRequireBehavior.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationRequireBehavior.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationRequireBehavior.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/OrganizationUsage.cs b/src/Auth0.ManagementApi/Models/Organization/OrganizationUsage.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/OrganizationUsage.cs
rename to src/Auth0.ManagementApi/Models/Organization/OrganizationUsage.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServer.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServer.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServer.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServer.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServerBase.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServerBase.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerBase.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServerCreateRequest.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServerCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServerGetRequest.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerGetRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServerGetRequest.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerGetRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServerScope.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerScope.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServerScope.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerScope.cs
diff --git a/src/Auth0.ManagementApi/Models/ResourceServerUpdateRequest.cs b/src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/ResourceServerUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/ResourceServerUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/TokenDialect.cs b/src/Auth0.ManagementApi/Models/ResourceServer/TokenDialect.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TokenDialect.cs
rename to src/Auth0.ManagementApi/Models/ResourceServer/TokenDialect.cs
diff --git a/src/Auth0.ManagementApi/Models/AssignUsersRequest.cs b/src/Auth0.ManagementApi/Models/Roles/AssignUsersRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AssignUsersRequest.cs
rename to src/Auth0.ManagementApi/Models/Roles/AssignUsersRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/AssignedUser.cs b/src/Auth0.ManagementApi/Models/Roles/AssignedUser.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AssignedUser.cs
rename to src/Auth0.ManagementApi/Models/Roles/AssignedUser.cs
diff --git a/src/Auth0.ManagementApi/Models/AssociatePermissionsRequest.cs b/src/Auth0.ManagementApi/Models/Roles/AssociatePermissionsRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AssociatePermissionsRequest.cs
rename to src/Auth0.ManagementApi/Models/Roles/AssociatePermissionsRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetRolesRequest.cs b/src/Auth0.ManagementApi/Models/Roles/GetRolesRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetRolesRequest.cs
rename to src/Auth0.ManagementApi/Models/Roles/GetRolesRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/Role.cs b/src/Auth0.ManagementApi/Models/Roles/Role.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Role.cs
rename to src/Auth0.ManagementApi/Models/Roles/Role.cs
diff --git a/src/Auth0.ManagementApi/Models/RoleBase.cs b/src/Auth0.ManagementApi/Models/Roles/RoleBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RoleBase.cs
rename to src/Auth0.ManagementApi/Models/Roles/RoleBase.cs
diff --git a/src/Auth0.ManagementApi/Models/RoleCreateRequest.cs b/src/Auth0.ManagementApi/Models/Roles/RoleCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RoleCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Roles/RoleCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/RoleUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Roles/RoleUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RoleUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Roles/RoleUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetRulesRequest.cs b/src/Auth0.ManagementApi/Models/Rules/GetRulesRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetRulesRequest.cs
rename to src/Auth0.ManagementApi/Models/Rules/GetRulesRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/Rule.cs b/src/Auth0.ManagementApi/Models/Rules/Rule.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/Rule.cs
rename to src/Auth0.ManagementApi/Models/Rules/Rule.cs
diff --git a/src/Auth0.ManagementApi/Models/RuleBase.cs b/src/Auth0.ManagementApi/Models/Rules/RuleBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RuleBase.cs
rename to src/Auth0.ManagementApi/Models/Rules/RuleBase.cs
diff --git a/src/Auth0.ManagementApi/Models/RuleCreateRequest.cs b/src/Auth0.ManagementApi/Models/Rules/RuleCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RuleCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Rules/RuleCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/RuleUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Rules/RuleUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RuleUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Rules/RuleUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/RulesConfig.cs b/src/Auth0.ManagementApi/Models/Rules/RulesConfig.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RulesConfig.cs
rename to src/Auth0.ManagementApi/Models/Rules/RulesConfig.cs
diff --git a/src/Auth0.ManagementApi/Models/RulesConfigCreateOrUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Rules/RulesConfigCreateOrUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/RulesConfigCreateOrUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Rules/RulesConfigCreateOrUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantChangePassword.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantChangePassword.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantChangePassword.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantChangePassword.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantDeviceFlow.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantDeviceFlow.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantDeviceFlow.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantDeviceFlow.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantDeviceFlowCharset.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantDeviceFlowCharset.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantDeviceFlowCharset.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantDeviceFlowCharset.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantErrorPage.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantErrorPage.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantErrorPage.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantErrorPage.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantFlags.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantFlags.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantFlags.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantFlags.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantGuardianMfaPage.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantGuardianMfaPage.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantGuardianMfaPage.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantGuardianMfaPage.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantSettings.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantSettings.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantSettings.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantSettings.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantSettingsBase.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantSettingsBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantSettingsBase.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantSettingsBase.cs
diff --git a/src/Auth0.ManagementApi/Models/TenantSettingsUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Tenant/TenantSettingsUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/TenantSettingsUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Tenant/TenantSettingsUpdateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/AccountLinkResponse.cs b/src/Auth0.ManagementApi/Models/Users/AccountLinkResponse.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AccountLinkResponse.cs
rename to src/Auth0.ManagementApi/Models/Users/AccountLinkResponse.cs
diff --git a/src/Auth0.ManagementApi/Models/AccountLinkResponseProfileData.cs b/src/Auth0.ManagementApi/Models/Users/AccountLinkResponseProfileData.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AccountLinkResponseProfileData.cs
rename to src/Auth0.ManagementApi/Models/Users/AccountLinkResponseProfileData.cs
diff --git a/src/Auth0.ManagementApi/Models/AssignRolesRequest.cs b/src/Auth0.ManagementApi/Models/Users/AssignRolesRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/AssignRolesRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/AssignRolesRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/GetUsersRequest.cs b/src/Auth0.ManagementApi/Models/Users/GetUsersRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/GetUsersRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/GetUsersRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/PermissionSource.cs b/src/Auth0.ManagementApi/Models/Users/PermissionSource.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/PermissionSource.cs
rename to src/Auth0.ManagementApi/Models/Users/PermissionSource.cs
diff --git a/src/Auth0.ManagementApi/Models/User.cs b/src/Auth0.ManagementApi/Models/Users/User.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/User.cs
rename to src/Auth0.ManagementApi/Models/Users/User.cs
diff --git a/src/Auth0.ManagementApi/Models/UserAccountJwtLinkRequest.cs b/src/Auth0.ManagementApi/Models/Users/UserAccountJwtLinkRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserAccountJwtLinkRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/UserAccountJwtLinkRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/UserAccountLinkRequest.cs b/src/Auth0.ManagementApi/Models/Users/UserAccountLinkRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserAccountLinkRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/UserAccountLinkRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/UserBase.cs b/src/Auth0.ManagementApi/Models/Users/UserBase.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserBase.cs
rename to src/Auth0.ManagementApi/Models/Users/UserBase.cs
diff --git a/src/Auth0.ManagementApi/Models/UserBlock.cs b/src/Auth0.ManagementApi/Models/Users/UserBlock.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserBlock.cs
rename to src/Auth0.ManagementApi/Models/Users/UserBlock.cs
diff --git a/src/Auth0.ManagementApi/Models/UserBlocks.cs b/src/Auth0.ManagementApi/Models/Users/UserBlocks.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserBlocks.cs
rename to src/Auth0.ManagementApi/Models/Users/UserBlocks.cs
diff --git a/src/Auth0.ManagementApi/Models/UserCreateRequest.cs b/src/Auth0.ManagementApi/Models/Users/UserCreateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserCreateRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/UserCreateRequest.cs
diff --git a/src/Auth0.ManagementApi/Models/UserPermission.cs b/src/Auth0.ManagementApi/Models/Users/UserPermission.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserPermission.cs
rename to src/Auth0.ManagementApi/Models/Users/UserPermission.cs
diff --git a/src/Auth0.ManagementApi/Models/UserUpdateRequest.cs b/src/Auth0.ManagementApi/Models/Users/UserUpdateRequest.cs
similarity index 100%
rename from src/Auth0.ManagementApi/Models/UserUpdateRequest.cs
rename to src/Auth0.ManagementApi/Models/Users/UserUpdateRequest.cs