Merge branch 'KelvinTegelaar:master' into master

AntoJUICT · Apr 3, 2024 · c1fd001 · c1fd001
2 parents a6d243d + 49df91f
commit c1fd001
Show file tree

Hide file tree

Showing 230 changed files with 311 additions and 457 deletions.
diff --git a/ListCippQueue/function.json b/ListCippQueue/function.json
diff --git a/ListGenericAllTenants/run.ps1 b/ListGenericAllTenants/run.ps1
@@ -4,13 +4,13 @@ param([string]$QueueItem, $TriggerMetadata)
 # Write out the queue message and metadata to the information log.
 Write-Host "PowerShell queue trigger function processed work item: $QueueItem"
 $TableURLName = ($QueueItem.tolower().split('?').Split('/') | Select-Object -First 1).toString()
-$QueueKey = (Get-CippQueue | Where-Object -Property Name -EQ $TableURLName | Select-Object -Last 1).RowKey
+$QueueKey = (Invoke-ListCippQueue | Where-Object -Property Name -EQ $TableURLName | Select-Object -Last 1).RowKey
 Update-CippQueueEntry -RowKey $QueueKey -Status 'Started'
 $Table = Get-CIPPTable -TableName "cache$TableURLName"
 $fullUrl = "https://graph.microsoft.com/beta/$QueueItem"
 Get-CIPPAzDataTableEntity @Table | Remove-AzDataTableEntity @table
 
-$RawGraphRequest = Get-Tenants | ForEach-Object -Parallel { 
+$RawGraphRequest = Get-Tenants | ForEach-Object -Parallel {
     $domainName = $_.defaultDomainName
     Import-Module CippCore
     try {
@@ -22,7 +22,7 @@ $RawGraphRequest = Get-Tenants | ForEach-Object -Parallel {
             Tenant     = $domainName
             CippStatus = "Could not connect to tenant. $($_.Exception.message)"
         }
-    } 
+    }
 }
 
 Update-CippQueueEntry -RowKey $QueueKey -Status 'Processing'

diff --git a/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1 b/Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1
@@ -41,7 +41,7 @@ function Add-CIPPApplicationPermission {
     foreach ($Grant in $Grants) {
         try {
             $SettingsRequest = New-GraphPOSTRequest -body ($Grant | ConvertTo-Json) -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/appRoleAssignedTo" -tenantid $Tenantfilter -type POST
-            $counter ++
+            $counter++
         } catch {
             $Results.add("Failed to grant $($Grant.appRoleId) to $($Grant.resourceId): $($_.Exception.Message)") | Out-Null
         }

diff --git a/Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1 b/Modules/CIPPCore/Public/CippQueue/Invoke-ListCippQueue.ps1
@@ -0,0 +1,23 @@
+function Invoke-ListCippQueue {
+    # Input bindings are passed in via param block.
+    param($Request = $null, $TriggerMetadata)
+
+    if ($Request) {
+        $APIName = $TriggerMetadata.FunctionName
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+        # Write to the Azure Functions log stream.
+        Write-Host 'PowerShell HTTP trigger function processed a request.'
+    }
+
+    $CippQueue = Get-CippTable -TableName 'CippQueue'
+    $CippQueueData = Get-CIPPAzDataTableEntity @CippQueue | Where-Object { ($_.Timestamp.DateTime) -ge (Get-Date).ToUniversalTime().AddHours(-1) } | Sort-Object -Property Timestamp -Descending
+    if ($request) {
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = @($CippQueueData)
+            })
+    } else {
+        return $CippQueueData
+    }
+}
diff --git a/Modules/CIPPCore/Public/CippQueue/Invoke-RemoveCippQueue.ps1 b/Modules/CIPPCore/Public/CippQueue/Invoke-RemoveCippQueue.ps1
@@ -0,0 +1,18 @@
+function Invoke-RemoveCippQueue {
+    # Input bindings are passed in via param block.
+    param($Request, $TriggerMetadata)
+
+    $APIName = $TriggerMetadata.FunctionName
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+    # Write to the Azure Functions log stream.
+    Write-Host 'PowerShell HTTP trigger function processed a request.'
+
+    $CippQueue = Get-CippTable -TableName 'CippQueue'
+    Clear-AzDataTable @CippQueue
+
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = @{Results = @('History cleared') }
+        })
+}
diff --git a/Modules/CIPPCore/Public/CippQueue/New-CippQueueEntry.ps1 b/Modules/CIPPCore/Public/CippQueue/New-CippQueueEntry.ps1
@@ -0,0 +1,23 @@
+function New-CippQueueEntry {
+    Param(
+        $Name,
+        $Link,
+        $Reference
+    )
+
+    $CippQueue = Get-CippTable -TableName CippQueue
+
+    $QueueEntry = @{
+        PartitionKey = 'CippQueue'
+        RowKey       = (New-Guid).Guid.ToString()
+        Name         = $Name
+        Link         = $Link
+        Reference    = $Reference
+        Status       = 'Queued'
+    }
+    $CippQueue.Entity = $QueueEntry
+
+    Add-CIPPAzDataTableEntity @CippQueue
+
+    $QueueEntry
+}
diff --git a/Modules/CIPPCore/Public/CippQueue/Update-CippQueueEntry.ps1 b/Modules/CIPPCore/Public/CippQueue/Update-CippQueueEntry.ps1
@@ -0,0 +1,29 @@
+function Update-CippQueueEntry {
+    Param(
+        [Parameter(Mandatory = $true)]
+        $RowKey,
+        $Status,
+        $Name
+    )
+
+    $CippQueue = Get-CippTable -TableName CippQueue
+
+    if ($RowKey) {
+        $QueueEntry = Get-CIPPAzDataTableEntity @CippQueue -Filter ("RowKey eq '{0}'" -f $RowKey)
+
+        if ($QueueEntry) {
+            if ($Status) {
+                $QueueEntry.Status = $Status
+            }
+            if ($Name) {
+                $QueueEntry.Name = $Name
+            }
+            Update-AzDataTableEntity @CippQueue -Entity $QueueEntry
+            $QueueEntry
+        } else {
+            return $false
+        }
+    } else {
+        return $false
+    }
+}
diff --git a/...oints/Push-AddAlertSubscription_Queue.ps1 → ...ggers/Push-AddAlertSubscription_Queue.ps1 b/...oints/Push-AddAlertSubscription_Queue.ps1 → ...ggers/Push-AddAlertSubscription_Queue.ps1
diff --git a/...trypoints/Push-CIPPAlertAdminPassword.ps1 → ... Triggers/Push-CIPPAlertAdminPassword.ps1 b/...trypoints/Push-CIPPAlertAdminPassword.ps1 → ... Triggers/Push-CIPPAlertAdminPassword.ps1
diff --git a/...trypoints/Push-CIPPAlertApnCertExpiry.ps1 → ... Triggers/Push-CIPPAlertApnCertExpiry.ps1 b/...trypoints/Push-CIPPAlertApnCertExpiry.ps1 → ... Triggers/Push-CIPPAlertApnCertExpiry.ps1
diff --git a/...ypoints/Push-CIPPAlertAppSecretExpiry.ps1 → ...riggers/Push-CIPPAlertAppSecretExpiry.ps1 b/...ypoints/Push-CIPPAlertAppSecretExpiry.ps1 → ...riggers/Push-CIPPAlertAppSecretExpiry.ps1
diff --git a/...ypoints/Push-CIPPAlertDefenderMalware.ps1 → ...riggers/Push-CIPPAlertDefenderMalware.ps1 b/...ypoints/Push-CIPPAlertDefenderMalware.ps1 → ...riggers/Push-CIPPAlertDefenderMalware.ps1
diff --git a/...rypoints/Push-CIPPAlertDefenderStatus.ps1 → ...Triggers/Push-CIPPAlertDefenderStatus.ps1 b/...rypoints/Push-CIPPAlertDefenderStatus.ps1 → ...Triggers/Push-CIPPAlertDefenderStatus.ps1
diff --git a/...rypoints/Push-CIPPAlertDepTokenExpiry.ps1 → ...Triggers/Push-CIPPAlertDepTokenExpiry.ps1 b/...rypoints/Push-CIPPAlertDepTokenExpiry.ps1 → ...Triggers/Push-CIPPAlertDepTokenExpiry.ps1
diff --git a/...points/Push-CIPPAlertExpiringLicenses.ps1 → ...iggers/Push-CIPPAlertExpiringLicenses.ps1 b/...points/Push-CIPPAlertExpiringLicenses.ps1 → ...iggers/Push-CIPPAlertExpiringLicenses.ps1
diff --git a/...c/Entrypoints/Push-CIPPAlertMFAAdmins.ps1 → ...vity Triggers/Push-CIPPAlertMFAAdmins.ps1 b/...c/Entrypoints/Push-CIPPAlertMFAAdmins.ps1 → ...vity Triggers/Push-CIPPAlertMFAAdmins.ps1
diff --git a/...trypoints/Push-CIPPAlertMFAAlertUsers.ps1 → ... Triggers/Push-CIPPAlertMFAAlertUsers.ps1 b/...trypoints/Push-CIPPAlertMFAAlertUsers.ps1 → ... Triggers/Push-CIPPAlertMFAAlertUsers.ps1
diff --git a/...rypoints/Push-CIPPAlertNewAppApproval.ps1 → ...Triggers/Push-CIPPAlertNewAppApproval.ps1 b/...rypoints/Push-CIPPAlertNewAppApproval.ps1 → ...Triggers/Push-CIPPAlertNewAppApproval.ps1
diff --git a/...lic/Entrypoints/Push-CIPPAlertNewRole.ps1 → ...tivity Triggers/Push-CIPPAlertNewRole.ps1 b/...lic/Entrypoints/Push-CIPPAlertNewRole.ps1 → ...tivity Triggers/Push-CIPPAlertNewRole.ps1
diff --git a/.../Entrypoints/Push-CIPPAlertNoCAConfig.ps1 → ...ity Triggers/Push-CIPPAlertNoCAConfig.ps1 b/.../Entrypoints/Push-CIPPAlertNoCAConfig.ps1 → ...ity Triggers/Push-CIPPAlertNoCAConfig.ps1
diff --git a/...points/Push-CIPPAlertOverusedLicenses.ps1 → ...iggers/Push-CIPPAlertOverusedLicenses.ps1 b/...points/Push-CIPPAlertOverusedLicenses.ps1 → ...iggers/Push-CIPPAlertOverusedLicenses.ps1
diff --git a/...c/Entrypoints/Push-CIPPAlertQuotaUsed.ps1 → ...vity Triggers/Push-CIPPAlertQuotaUsed.ps1 b/...c/Entrypoints/Push-CIPPAlertQuotaUsed.ps1 → ...vity Triggers/Push-CIPPAlertQuotaUsed.ps1
diff --git a/...oints/Push-CIPPAlertSecDefaultsUpsell.ps1 → ...ggers/Push-CIPPAlertSecDefaultsUpsell.ps1 b/...oints/Push-CIPPAlertSecDefaultsUpsell.ps1 → ...ggers/Push-CIPPAlertSecDefaultsUpsell.ps1
diff --git a/...ypoints/Push-CIPPAlertSharepointQuota.ps1 → ...riggers/Push-CIPPAlertSharepointQuota.ps1 b/...ypoints/Push-CIPPAlertSharepointQuota.ps1 → ...riggers/Push-CIPPAlertSharepointQuota.ps1
diff --git a/...rypoints/Push-CIPPAlertUnusedLicenses.ps1 → ...Triggers/Push-CIPPAlertUnusedLicenses.ps1 b/...rypoints/Push-CIPPAlertUnusedLicenses.ps1 → ...Triggers/Push-CIPPAlertUnusedLicenses.ps1
diff --git a/...rypoints/Push-CIPPAlertVppTokenExpiry.ps1 → ...Triggers/Push-CIPPAlertVppTokenExpiry.ps1 b/...rypoints/Push-CIPPAlertVppTokenExpiry.ps1 → ...Triggers/Push-CIPPAlertVppTokenExpiry.ps1
diff --git a/.../Public/Entrypoints/Push-CIPPStandard.ps1 → ...s/Activity Triggers/Push-CIPPStandard.ps1 b/.../Public/Entrypoints/Push-CIPPStandard.ps1 → ...s/Activity Triggers/Push-CIPPStandard.ps1
diff --git a/...ntrypoints/Push-ExecAddMultiTenantApp.ps1 → ...y Triggers/Push-ExecAddMultiTenantApp.ps1 b/...ntrypoints/Push-ExecAddMultiTenantApp.ps1 → ...y Triggers/Push-ExecAddMultiTenantApp.ps1
diff --git a/.../Entrypoints/Push-ExecGDAPInviteQueue.ps1 → ...ity Triggers/Push-ExecGDAPInviteQueue.ps1 b/.../Entrypoints/Push-ExecGDAPInviteQueue.ps1 → ...ity Triggers/Push-ExecGDAPInviteQueue.ps1
diff --git a/...trypoints/Push-ExecOnboardTenantQueue.ps1 → ... Triggers/Push-ExecOnboardTenantQueue.ps1 b/...trypoints/Push-ExecOnboardTenantQueue.ps1 → ... Triggers/Push-ExecOnboardTenantQueue.ps1
diff --git a/...Entrypoints/Push-ExecScheduledCommand.ps1 → ...ty Triggers/Push-ExecScheduledCommand.ps1 b/...Entrypoints/Push-ExecScheduledCommand.ps1 → ...ty Triggers/Push-ExecScheduledCommand.ps1
diff --git a/...c/Entrypoints/Push-GetPendingWebhooks.ps1 → ...vity Triggers/Push-GetPendingWebhooks.ps1 b/...c/Entrypoints/Push-GetPendingWebhooks.ps1 → ...vity Triggers/Push-GetPendingWebhooks.ps1
diff --git a/...ntrypoints/Push-ListGraphRequestQueue.ps1 → ...y Triggers/Push-ListGraphRequestQueue.ps1 b/...ntrypoints/Push-ListGraphRequestQueue.ps1 → ...y Triggers/Push-ListGraphRequestQueue.ps1
diff --git a/...ic/Entrypoints/Push-ListLicensesQueue.ps1 → ...ivity Triggers/Push-ListLicensesQueue.ps1 b/...ic/Entrypoints/Push-ListLicensesQueue.ps1 → ...ivity Triggers/Push-ListLicensesQueue.ps1
diff --git a/...ic/Entrypoints/Push-ListMFAUsersQueue.ps1 → ...ivity Triggers/Push-ListMFAUsersQueue.ps1 b/...ic/Entrypoints/Push-ListMFAUsersQueue.ps1 → ...ivity Triggers/Push-ListMFAUsersQueue.ps1
diff --git a/...ntrypoints/Push-ListMailboxRulesQueue.ps1 → ...y Triggers/Push-ListMailboxRulesQueue.ps1 b/...ntrypoints/Push-ListMailboxRulesQueue.ps1 → ...y Triggers/Push-ListMailboxRulesQueue.ps1
diff --git a/...Entrypoints/Push-PublicWebhookProcess.ps1 → ...ty Triggers/Push-PublicWebhookProcess.ps1 b/...Entrypoints/Push-PublicWebhookProcess.ps1 → ...ty Triggers/Push-PublicWebhookProcess.ps1
diff --git a/...ublic/Entrypoints/Push-SchedulerAlert.ps1 → ...Activity Triggers/Push-SchedulerAlert.ps1 b/...ublic/Entrypoints/Push-SchedulerAlert.ps1 → ...Activity Triggers/Push-SchedulerAlert.ps1
diff --git a/...oints/Push-SchedulerCIPPNotifications.ps1 → ...ggers/Push-SchedulerCIPPNotifications.ps1 b/...oints/Push-SchedulerCIPPNotifications.ps1 → ...ggers/Push-SchedulerCIPPNotifications.ps1
diff --git a/...ypoints/Push-Schedulerwebhookcreation.ps1 → ...riggers/Push-Schedulerwebhookcreation.ps1 b/...ypoints/Push-Schedulerwebhookcreation.ps1 → ...riggers/Push-Schedulerwebhookcreation.ps1
diff --git a/...trypoints/Push-UpdatePermissionsQueue.ps1 → ... Triggers/Push-UpdatePermissionsQueue.ps1 b/...trypoints/Push-UpdatePermissionsQueue.ps1 → ... Triggers/Push-UpdatePermissionsQueue.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-UpdateTenants.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-UpdateTenants.ps1
@@ -0,0 +1,18 @@
+function Push-UpdateTenants {
+    Param($Item)
+    $QueueReference = 'UpdateTenants'
+    $RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -ne 'Completed' -and $_.Status -ne 'Failed' }
+    if ($RunningQueue) {
+        Write-Host 'Update Tenants already running'
+        return
+    }
+    $Queue = New-CippQueueEntry -Name 'Update Tenants' -Reference $QueueReference
+    try {
+        Update-CippQueueEntry -RowKey $Queue.RowKey -Status 'Running'
+        Get-Tenants | Out-Null
+        Update-CippQueueEntry -RowKey $Queue.RowKey -Status 'Completed'
+    } catch {
+        Write-Host "Queue Error: $($_.Exception.Message)"
+        Update-CippQueueEntry -RowKey $Queue.RowKey -Status 'Failed'
+    }
+}
diff --git a/...c/Entrypoints/Push-Z_CIPPQueueTrigger.ps1 → ...vity Triggers/Push-Z_CIPPQueueTrigger.ps1 b/...c/Entrypoints/Push-Z_CIPPQueueTrigger.ps1 → ...vity Triggers/Push-Z_CIPPQueueTrigger.ps1
diff --git a/...c/Entrypoints/Invoke-ExecEditTemplate.ps1 → ...ons/CIPP/Core/Invoke-ExecEditTemplate.ps1 b/...c/Entrypoints/Invoke-ExecEditTemplate.ps1 → ...ons/CIPP/Core/Invoke-ExecEditTemplate.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecGeoIPLookup.ps1 → ...ions/CIPP/Core/Invoke-ExecGeoIPLookup.ps1 b/...ic/Entrypoints/Invoke-ExecGeoIPLookup.ps1 → ...ions/CIPP/Core/Invoke-ExecGeoIPLookup.ps1
diff --git a/...c/Entrypoints/Invoke-ExecGraphRequest.ps1 → ...ons/CIPP/Core/Invoke-ExecGraphRequest.ps1 b/...c/Entrypoints/Invoke-ExecGraphRequest.ps1 → ...ons/CIPP/Core/Invoke-ExecGraphRequest.ps1
diff --git a/...blic/Entrypoints/Invoke-GetCippAlerts.ps1 → ...ctions/CIPP/Core/Invoke-GetCippAlerts.ps1 b/...blic/Entrypoints/Invoke-GetCippAlerts.ps1 → ...ctions/CIPP/Core/Invoke-GetCippAlerts.ps1
diff --git a/.../Public/Entrypoints/Invoke-GetVersion.ps1 → ...Functions/CIPP/Core/Invoke-GetVersion.ps1 b/.../Public/Entrypoints/Invoke-GetVersion.ps1 → ...Functions/CIPP/Core/Invoke-GetVersion.ps1
diff --git a/...c/Entrypoints/Invoke-AddScheduledItem.ps1 → ...IPP/Scheduler/Invoke-AddScheduledItem.ps1 b/...c/Entrypoints/Invoke-AddScheduledItem.ps1 → ...IPP/Scheduler/Invoke-AddScheduledItem.ps1
diff --git a/...trypoints/Invoke-ExecScheduledCommand.ps1 → ...Scheduler/Invoke-ExecScheduledCommand.ps1 b/...trypoints/Invoke-ExecScheduledCommand.ps1 → ...Scheduler/Invoke-ExecScheduledCommand.ps1
diff --git a/...c/Entrypoints/Invoke-ExecAccessChecks.ps1 → ...CIPP/Settings/Invoke-ExecAccessChecks.ps1 b/...c/Entrypoints/Invoke-ExecAccessChecks.ps1 → ...CIPP/Settings/Invoke-ExecAccessChecks.ps1
diff --git a/...c/Entrypoints/Invoke-ExecAddTrustedIP.ps1 → ...CIPP/Settings/Invoke-ExecAddTrustedIP.ps1 b/...c/Entrypoints/Invoke-ExecAddTrustedIP.ps1 → ...CIPP/Settings/Invoke-ExecAddTrustedIP.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecBackendURLs.ps1 → .../CIPP/Settings/Invoke-ExecBackendURLs.ps1 b/...ic/Entrypoints/Invoke-ExecBackendURLs.ps1 → .../CIPP/Settings/Invoke-ExecBackendURLs.ps1
diff --git a/...Entrypoints/Invoke-ExecCPVPermissions.ps1 → ...PP/Settings/Invoke-ExecCPVPermissions.ps1 b/...Entrypoints/Invoke-ExecCPVPermissions.ps1 → ...PP/Settings/Invoke-ExecCPVPermissions.ps1
diff --git a/...blic/Entrypoints/Invoke-ExecDnsConfig.ps1 → ...ns/CIPP/Settings/Invoke-ExecDnsConfig.ps1 b/...blic/Entrypoints/Invoke-ExecDnsConfig.ps1 → ...ns/CIPP/Settings/Invoke-ExecDnsConfig.ps1
diff --git a/...ntrypoints/Invoke-ExecExcludeLicenses.ps1 → ...P/Settings/Invoke-ExecExcludeLicenses.ps1 b/...ntrypoints/Invoke-ExecExcludeLicenses.ps1 → ...P/Settings/Invoke-ExecExcludeLicenses.ps1
diff --git a/.../Entrypoints/Invoke-ExecExcludeTenant.ps1 → ...IPP/Settings/Invoke-ExecExcludeTenant.ps1 b/.../Entrypoints/Invoke-ExecExcludeTenant.ps1 → ...IPP/Settings/Invoke-ExecExcludeTenant.ps1
diff --git a/...trypoints/Invoke-ExecExtensionMapping.ps1 → .../Settings/Invoke-ExecExtensionMapping.ps1 b/...trypoints/Invoke-ExecExtensionMapping.ps1 → .../Settings/Invoke-ExecExtensionMapping.ps1
diff --git a/.../Entrypoints/Invoke-ExecExtensionSync.ps1 → ...IPP/Settings/Invoke-ExecExtensionSync.ps1 b/.../Entrypoints/Invoke-ExecExtensionSync.ps1 → ...IPP/Settings/Invoke-ExecExtensionSync.ps1
diff --git a/.../Entrypoints/Invoke-ExecExtensionTest.ps1 → ...IPP/Settings/Invoke-ExecExtensionTest.ps1 b/.../Entrypoints/Invoke-ExecExtensionTest.ps1 → ...IPP/Settings/Invoke-ExecExtensionTest.ps1
diff --git a/...trypoints/Invoke-ExecExtensionsConfig.ps1 → .../Settings/Invoke-ExecExtensionsConfig.ps1 b/...trypoints/Invoke-ExecExtensionsConfig.ps1 → .../Settings/Invoke-ExecExtensionsConfig.ps1
diff --git a/...ypoints/Invoke-ExecMaintenanceScripts.ps1 → ...ettings/Invoke-ExecMaintenanceScripts.ps1 b/...ypoints/Invoke-ExecMaintenanceScripts.ps1 → ...ettings/Invoke-ExecMaintenanceScripts.ps1
diff --git a/...ypoints/Invoke-ExecNotificationConfig.ps1 → ...ettings/Invoke-ExecNotificationConfig.ps1 b/...ypoints/Invoke-ExecNotificationConfig.ps1 → ...ettings/Invoke-ExecNotificationConfig.ps1
diff --git a/...Entrypoints/Invoke-ExecPasswordConfig.ps1 → ...PP/Settings/Invoke-ExecPasswordConfig.ps1 b/...Entrypoints/Invoke-ExecPasswordConfig.ps1 → ...PP/Settings/Invoke-ExecPasswordConfig.ps1
diff --git a/.../Entrypoints/Invoke-ExecRestoreBackup.ps1 → ...IPP/Settings/Invoke-ExecRestoreBackup.ps1 b/.../Entrypoints/Invoke-ExecRestoreBackup.ps1 → ...IPP/Settings/Invoke-ExecRestoreBackup.ps1
diff --git a/...blic/Entrypoints/Invoke-ExecRunBackup.ps1 → ...ns/CIPP/Settings/Invoke-ExecRunBackup.ps1 b/...blic/Entrypoints/Invoke-ExecRunBackup.ps1 → ...ns/CIPP/Settings/Invoke-ExecRunBackup.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecSAMSetup.ps1 → ...ctions/CIPP/Setup/Invoke-ExecSAMSetup.ps1 b/...ublic/Entrypoints/Invoke-ExecSAMSetup.ps1 → ...ctions/CIPP/Setup/Invoke-ExecSAMSetup.ps1
diff --git a/.../Public/Entrypoints/Invoke-AddContact.ps1 → ...ions/Email-Exchange/Invoke-AddContact.ps1 b/.../Public/Entrypoints/Invoke-AddContact.ps1 → ...ions/Email-Exchange/Invoke-AddContact.ps1
diff --git a/...lic/Entrypoints/Invoke-AddExConnector.ps1 → .../Email-Exchange/Invoke-AddExConnector.ps1 b/...lic/Entrypoints/Invoke-AddExConnector.ps1 → .../Email-Exchange/Invoke-AddExConnector.ps1
diff --git a/...ypoints/Invoke-AddExConnectorTemplate.ps1 → ...xchange/Invoke-AddExConnectorTemplate.ps1 b/...ypoints/Invoke-AddExConnectorTemplate.ps1 → ...xchange/Invoke-AddExConnectorTemplate.ps1
diff --git a/...c/Entrypoints/Invoke-AddSharedMailbox.ps1 → ...mail-Exchange/Invoke-AddSharedMailbox.ps1 b/...c/Entrypoints/Invoke-AddSharedMailbox.ps1 → ...mail-Exchange/Invoke-AddSharedMailbox.ps1
diff --git a/...blic/Entrypoints/Invoke-AddSpamFilter.ps1 → ...s/Email-Exchange/Invoke-AddSpamFilter.ps1 b/...blic/Entrypoints/Invoke-AddSpamFilter.ps1 → ...s/Email-Exchange/Invoke-AddSpamFilter.ps1
diff --git a/...rypoints/Invoke-AddSpamFilterTemplate.ps1 → ...Exchange/Invoke-AddSpamFilterTemplate.ps1 b/...rypoints/Invoke-AddSpamFilterTemplate.ps1 → ...Exchange/Invoke-AddSpamFilterTemplate.ps1
diff --git a/...c/Entrypoints/Invoke-AddTransportRule.ps1 → ...mail-Exchange/Invoke-AddTransportRule.ps1 b/...c/Entrypoints/Invoke-AddTransportRule.ps1 → ...mail-Exchange/Invoke-AddTransportRule.ps1
diff --git a/...trypoints/Invoke-AddTransportTemplate.ps1 → ...-Exchange/Invoke-AddTransportTemplate.ps1 b/...trypoints/Invoke-AddTransportTemplate.ps1 → ...-Exchange/Invoke-AddTransportTemplate.ps1
diff --git a/...ic/Entrypoints/Invoke-EditExConnector.ps1 → ...Email-Exchange/Invoke-EditExConnector.ps1 b/...ic/Entrypoints/Invoke-EditExConnector.ps1 → ...Email-Exchange/Invoke-EditExConnector.ps1
diff --git a/...lic/Entrypoints/Invoke-EditSpamFilter.ps1 → .../Email-Exchange/Invoke-EditSpamFilter.ps1 b/...lic/Entrypoints/Invoke-EditSpamFilter.ps1 → .../Email-Exchange/Invoke-EditSpamFilter.ps1
diff --git a/.../Entrypoints/Invoke-EditTransportRule.ps1 → ...ail-Exchange/Invoke-EditTransportRule.ps1 b/.../Entrypoints/Invoke-EditTransportRule.ps1 → ...ail-Exchange/Invoke-EditTransportRule.ps1
diff --git a/...nts/Invoke-ExecConverttoSharedMailbox.ps1 → ...nge/Invoke-ExecConverttoSharedMailbox.ps1 b/...nts/Invoke-ExecConverttoSharedMailbox.ps1 → ...nge/Invoke-ExecConverttoSharedMailbox.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecCopyForSent.ps1 → ...Email-Exchange/Invoke-ExecCopyForSent.ps1 b/...ic/Entrypoints/Invoke-ExecCopyForSent.ps1 → ...Email-Exchange/Invoke-ExecCopyForSent.ps1
diff --git a/...points/Invoke-ExecDisableEmailForward.ps1 → ...change/Invoke-ExecDisableEmailForward.ps1 b/...points/Invoke-ExecDisableEmailForward.ps1 → ...change/Invoke-ExecDisableEmailForward.ps1
diff --git a/...ts/Invoke-ExecEditCalendarPermissions.ps1 → ...ge/Invoke-ExecEditCalendarPermissions.ps1 b/...ts/Invoke-ExecEditCalendarPermissions.ps1 → ...ge/Invoke-ExecEditCalendarPermissions.ps1
diff --git a/...nts/Invoke-ExecEditMailboxPermissions.ps1 → ...nge/Invoke-ExecEditMailboxPermissions.ps1 b/...nts/Invoke-ExecEditMailboxPermissions.ps1 → ...nge/Invoke-ExecEditMailboxPermissions.ps1
diff --git a/...c/Entrypoints/Invoke-ExecEmailForward.ps1 → ...mail-Exchange/Invoke-ExecEmailForward.ps1 b/...c/Entrypoints/Invoke-ExecEmailForward.ps1 → ...mail-Exchange/Invoke-ExecEmailForward.ps1
diff --git a/.../Entrypoints/Invoke-ExecEnableArchive.ps1 → ...ail-Exchange/Invoke-ExecEnableArchive.ps1 b/.../Entrypoints/Invoke-ExecEnableArchive.ps1 → ...ail-Exchange/Invoke-ExecEnableArchive.ps1
diff --git a/...c/Entrypoints/Invoke-ExecGroupsDelete.ps1 → ...mail-Exchange/Invoke-ExecGroupsDelete.ps1 b/...c/Entrypoints/Invoke-ExecGroupsDelete.ps1 → ...mail-Exchange/Invoke-ExecGroupsDelete.ps1
diff --git a/...s/Invoke-ExecGroupsDeliveryManagement.ps1 → ...e/Invoke-ExecGroupsDeliveryManagement.ps1 b/...s/Invoke-ExecGroupsDeliveryManagement.ps1 → ...e/Invoke-ExecGroupsDeliveryManagement.ps1
diff --git a/...rypoints/Invoke-ExecGroupsHideFromGAL.ps1 → ...Exchange/Invoke-ExecGroupsHideFromGAL.ps1 b/...rypoints/Invoke-ExecGroupsHideFromGAL.ps1 → ...Exchange/Invoke-ExecGroupsHideFromGAL.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecHideFromGAL.ps1 → ...Email-Exchange/Invoke-ExecHideFromGAL.ps1 b/...ic/Entrypoints/Invoke-ExecHideFromGAL.ps1 → ...Email-Exchange/Invoke-ExecHideFromGAL.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecMailTest.ps1 → ...ns/Email-Exchange/Invoke-ExecMailTest.ps1 b/...ublic/Entrypoints/Invoke-ExecMailTest.ps1 → ...ns/Email-Exchange/Invoke-ExecMailTest.ps1
@@ -18,7 +18,7 @@ Function Invoke-ExecMailTest {
             'CheckConfig' {
                 $GraphToken = Get-GraphToken -returnRefresh $true -SkipCache $true
                 $AccessTokenDetails = Read-JwtAccessDetails -Token $GraphToken.access_token
-                $Me = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/me?$select=displayName,proxyAddresses' -NoAuthCheck $true
+                $Me = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/me?$select=displayName,userPrincipalName,proxyAddresses' -NoAuthCheck $true
                 if ($AccessTokenDetails.Scope -contains 'Mail.Read') {
                     $Message = 'Mail.Read - Delegated was found in the token scope.'
                     $HasMailRead = $true
@@ -27,35 +27,43 @@ Function Invoke-ExecMailTest {
                     $HasMailRead = $false
                 }
 
+                if ($Me.proxyAddresses) {
+                    $Emails = $Me.proxyAddresses | Select-Object @{n = 'Address'; exp = { ($_ -split ':')[1] } }, @{n = 'IsPrimary'; exp = { $_ -cmatch 'SMTP' } }
+                } else {
+                    $Emails = @(@{ Address = $Me.userPrincipalName; IsPrimary = $true })
+                }
+
                 $Body = [PSCustomObject]@{
                     Message       = $Message
                     HasMailRead   = $HasMailRead
                     MailUser      = $Me.displayName
-                    MailAddresses = $Me.proxyAddresses | Select-Object @{n = 'Address'; exp = { ($_ -split ':')[1] } }, @{n = 'IsPrimary'; exp = { $_ -cmatch 'SMTP' } }
+                    MailAddresses = @($Emails)
                 }
             }
             default {
                 $Messages = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/me/mailFolders/Inbox/messages?`$select=receivedDateTime,subject,sender,internetMessageHeaders,webLink" -NoAuthCheck $true
                 $Results = foreach ($Message in $Messages) {
-                    $AuthResult = ($Message.internetMessageHeaders | Where-Object -Property name -EQ 'Authentication-Results').value
-                    $AuthResult = $AuthResult -split ';\s*'
-                    $AuthResult = $AuthResult | ForEach-Object {
-                        if ($_ -match '^(?<Name>.+?)=\s*(?<Status>.+?)\s(?<Info>.+)$') {
-                            [PSCustomObject]@{
-                                Name   = $Matches.Name
-                                Status = $Matches.Status
-                                Info   = $Matches.Info
+                    if ($Message.receivedDateTime) {
+                        $AuthResult = ($Message.internetMessageHeaders | Where-Object -Property name -EQ 'Authentication-Results').value
+                        $AuthResult = $AuthResult -split ';\s*'
+                        $AuthResult = $AuthResult | ForEach-Object {
+                            if ($_ -match '^(?<Name>.+?)=\s*(?<Status>.+?)\s(?<Info>.+)$') {
+                                [PSCustomObject]@{
+                                    Name   = $Matches.Name
+                                    Status = $Matches.Status
+                                    Info   = $Matches.Info
+                                }
                             }
                         }
-                    }
-                    [PSCustomObject]@{
-                        Received   = $Message.receivedDateTime
-                        Subject    = $Message.subject
-                        Sender     = $Message.sender.emailAddress.name
-                        From       = $Message.sender.emailAddress.address
-                        Link       = $Message.webLink
-                        Headers    = $Message.internetMessageHeaders 
-                        AuthResult = $AuthResult
+                        [PSCustomObject]@{
+                            Received   = $Message.receivedDateTime
+                            Subject    = $Message.subject
+                            Sender     = $Message.sender.emailAddress.name
+                            From       = $Message.sender.emailAddress.address
+                            Link       = $Message.webLink
+                            Headers    = $Message.internetMessageHeaders
+                            AuthResult = $AuthResult
+                        }
                     }
                 }
                 $Body = [PSCustomObject]@{

diff --git a/...oints/Invoke-ExecMailboxMobileDevices.ps1 → ...hange/Invoke-ExecMailboxMobileDevices.ps1 b/...oints/Invoke-ExecMailboxMobileDevices.ps1 → ...hange/Invoke-ExecMailboxMobileDevices.ps1
diff --git a/...Entrypoints/Invoke-ExecMailboxRestore.ps1 → ...il-Exchange/Invoke-ExecMailboxRestore.ps1 b/...Entrypoints/Invoke-ExecMailboxRestore.ps1 → ...il-Exchange/Invoke-ExecMailboxRestore.ps1
diff --git a/...oints/Invoke-ExecQuarantineManagement.ps1 → ...hange/Invoke-ExecQuarantineManagement.ps1 b/...oints/Invoke-ExecQuarantineManagement.ps1 → ...hange/Invoke-ExecQuarantineManagement.ps1
diff --git a/...ntrypoints/Invoke-ExecSetMailboxQuota.ps1 → ...l-Exchange/Invoke-ExecSetMailboxQuota.ps1 b/...ntrypoints/Invoke-ExecSetMailboxQuota.ps1 → ...l-Exchange/Invoke-ExecSetMailboxQuota.ps1
diff --git a/.../Public/Entrypoints/Invoke-ExecSetOoO.ps1 → ...ions/Email-Exchange/Invoke-ExecSetOoO.ps1 b/.../Public/Entrypoints/Invoke-ExecSetOoO.ps1 → ...ions/Email-Exchange/Invoke-ExecSetOoO.ps1
diff --git a/...Entrypoints/Invoke-ListMailQuarantine.ps1 → ...il-Exchange/Invoke-ListMailQuarantine.ps1 b/...Entrypoints/Invoke-ListMailQuarantine.ps1 → ...il-Exchange/Invoke-ListMailQuarantine.ps1
diff --git a/...c/Entrypoints/Invoke-ListMessageTrace.ps1 → ...mail-Exchange/Invoke-ListMessageTrace.ps1 b/...c/Entrypoints/Invoke-ListMessageTrace.ps1 → ...mail-Exchange/Invoke-ListMessageTrace.ps1
diff --git a/...ore/Public/Entrypoints/Invoke-ListOoO.ps1 → ...nctions/Email-Exchange/Invoke-ListOoO.ps1 b/...ore/Public/Entrypoints/Invoke-ListOoO.ps1 → ...nctions/Email-Exchange/Invoke-ListOoO.ps1
diff --git a/.../Entrypoints/Invoke-ListPhishPolicies.ps1 → ...ail-Exchange/Invoke-ListPhishPolicies.ps1 b/.../Entrypoints/Invoke-ListPhishPolicies.ps1 → ...ail-Exchange/Invoke-ListPhishPolicies.ps1
diff --git a/...lic/Entrypoints/Invoke-ListRecipients.ps1 → .../Email-Exchange/Invoke-ListRecipients.ps1 b/...lic/Entrypoints/Invoke-ListRecipients.ps1 → .../Email-Exchange/Invoke-ListRecipients.ps1
diff --git a/...points/Invoke-ListSpamFilterTemplates.ps1 → ...change/Invoke-ListSpamFilterTemplates.ps1 b/...points/Invoke-ListSpamFilterTemplates.ps1 → ...change/Invoke-ListSpamFilterTemplates.ps1
diff --git a/...lic/Entrypoints/Invoke-ListSpamfilter.ps1 → .../Email-Exchange/Invoke-ListSpamfilter.ps1 b/...lic/Entrypoints/Invoke-ListSpamfilter.ps1 → .../Email-Exchange/Invoke-ListSpamfilter.ps1
diff --git a/...Entrypoints/Invoke-ListTransportRules.ps1 → ...il-Exchange/Invoke-ListTransportRules.ps1 b/...Entrypoints/Invoke-ListTransportRules.ps1 → ...il-Exchange/Invoke-ListTransportRules.ps1
diff --git a/...ts/Invoke-ListTransportRulesTemplates.ps1 → ...ge/Invoke-ListTransportRulesTemplates.ps1 b/...ts/Invoke-ListTransportRulesTemplates.ps1 → ...ge/Invoke-ListTransportRulesTemplates.ps1
diff --git a/...Public/Entrypoints/Invoke-AddChocoApp.ps1 → ...point/Applications/Invoke-AddChocoApp.ps1 b/...Public/Entrypoints/Invoke-AddChocoApp.ps1 → ...point/Applications/Invoke-AddChocoApp.ps1
diff --git a/...e/Public/Entrypoints/Invoke-AddMSPApp.ps1 → ...ndpoint/Applications/Invoke-AddMSPApp.ps1 b/...e/Public/Entrypoints/Invoke-AddMSPApp.ps1 → ...ndpoint/Applications/Invoke-AddMSPApp.ps1
diff --git a/...ublic/Entrypoints/Invoke-AddOfficeApp.ps1 → ...oint/Applications/Invoke-AddOfficeApp.ps1 b/...ublic/Entrypoints/Invoke-AddOfficeApp.ps1 → ...oint/Applications/Invoke-AddOfficeApp.ps1
diff --git a/...ublic/Entrypoints/Invoke-AddWinGetApp.ps1 → ...oint/Applications/Invoke-AddWinGetApp.ps1 b/...ublic/Entrypoints/Invoke-AddWinGetApp.ps1 → ...oint/Applications/Invoke-AddWinGetApp.ps1
diff --git a/...blic/Entrypoints/Invoke-ExecAssignApp.ps1 → ...int/Applications/Invoke-ExecAssignApp.ps1 b/...blic/Entrypoints/Invoke-ExecAssignApp.ps1 → ...int/Applications/Invoke-ExecAssignApp.ps1
diff --git a/...trypoints/Invoke-ListApplicationQueue.ps1 → ...lications/Invoke-ListApplicationQueue.ps1 b/...trypoints/Invoke-ListApplicationQueue.ps1 → ...lications/Invoke-ListApplicationQueue.ps1
diff --git a/...re/Public/Entrypoints/Invoke-ListApps.ps1 → ...Endpoint/Applications/Invoke-ListApps.ps1 b/...re/Public/Entrypoints/Invoke-ListApps.ps1 → ...Endpoint/Applications/Invoke-ListApps.ps1
diff --git a/...Entrypoints/Invoke-ListAppsRepository.ps1 → ...pplications/Invoke-ListAppsRepository.ps1 b/...Entrypoints/Invoke-ListAppsRepository.ps1 → ...pplications/Invoke-ListAppsRepository.ps1
diff --git a/...Public/Entrypoints/Invoke-AddAPDevice.ps1 → ...Endpoint/Autopilot/Invoke-AddAPDevice.ps1 b/...Public/Entrypoints/Invoke-AddAPDevice.ps1 → ...Endpoint/Autopilot/Invoke-AddAPDevice.ps1
diff --git a/...Entrypoints/Invoke-AddAutopilotConfig.ps1 → ...t/Autopilot/Invoke-AddAutopilotConfig.ps1 b/...Entrypoints/Invoke-AddAutopilotConfig.ps1 → ...t/Autopilot/Invoke-AddAutopilotConfig.ps1
diff --git a/...blic/Entrypoints/Invoke-AddEnrollment.ps1 → ...dpoint/Autopilot/Invoke-AddEnrollment.ps1 b/...blic/Entrypoints/Invoke-AddEnrollment.ps1 → ...dpoint/Autopilot/Invoke-AddEnrollment.ps1
diff --git a/...Entrypoints/Invoke-ExecAssignAPDevice.ps1 → ...t/Autopilot/Invoke-ExecAssignAPDevice.ps1 b/...Entrypoints/Invoke-ExecAssignAPDevice.ps1 → ...t/Autopilot/Invoke-ExecAssignAPDevice.ps1
diff --git a/...blic/Entrypoints/Invoke-ListAPDevices.ps1 → ...dpoint/Autopilot/Invoke-ListAPDevices.ps1 b/...blic/Entrypoints/Invoke-ListAPDevices.ps1 → ...dpoint/Autopilot/Invoke-ListAPDevices.ps1
diff --git a/...rypoints/Invoke-AddDefenderDeployment.ps1 → ...oint/MEM/Invoke-AddDefenderDeployment.ps1 b/...rypoints/Invoke-AddDefenderDeployment.ps1 → ...oint/MEM/Invoke-AddDefenderDeployment.ps1
diff --git a/.../Entrypoints/Invoke-AddIntuneTemplate.ps1 → ...Endpoint/MEM/Invoke-AddIntuneTemplate.ps1 b/.../Entrypoints/Invoke-AddIntuneTemplate.ps1 → ...Endpoint/MEM/Invoke-AddIntuneTemplate.ps1
diff --git a/...e/Public/Entrypoints/Invoke-AddPolicy.ps1 → ...nctions/Endpoint/MEM/Invoke-AddPolicy.ps1 b/...e/Public/Entrypoints/Invoke-AddPolicy.ps1 → ...nctions/Endpoint/MEM/Invoke-AddPolicy.ps1
diff --git a/.../Public/Entrypoints/Invoke-EditPolicy.ps1 → ...ctions/Endpoint/MEM/Invoke-EditPolicy.ps1 b/.../Public/Entrypoints/Invoke-EditPolicy.ps1 → ...ctions/Endpoint/MEM/Invoke-EditPolicy.ps1
diff --git a/...c/Entrypoints/Invoke-ExecAssignPolicy.ps1 → .../Endpoint/MEM/Invoke-ExecAssignPolicy.ps1 b/...c/Entrypoints/Invoke-ExecAssignPolicy.ps1 → .../Endpoint/MEM/Invoke-ExecAssignPolicy.ps1
diff --git a/...c/Entrypoints/Invoke-ExecDeviceAction.ps1 → .../Endpoint/MEM/Invoke-ExecDeviceAction.ps1 b/...c/Entrypoints/Invoke-ExecDeviceAction.ps1 → .../Endpoint/MEM/Invoke-ExecDeviceAction.ps1
diff --git a/...ints/Invoke-ExecGetLocalAdminPassword.ps1 → .../MEM/Invoke-ExecGetLocalAdminPassword.ps1 b/...ints/Invoke-ExecGetLocalAdminPassword.ps1 → .../MEM/Invoke-ExecGetLocalAdminPassword.ps1
diff --git a/...Entrypoints/Invoke-ExecGetRecoveryKey.ps1 → ...ndpoint/MEM/Invoke-ExecGetRecoveryKey.ps1 b/...Entrypoints/Invoke-ExecGetRecoveryKey.ps1 → ...ndpoint/MEM/Invoke-ExecGetRecoveryKey.ps1
diff --git a/...Public/Entrypoints/Invoke-ListDevices.ps1 → ...s/Endpoint/Reports/Invoke-ListDevices.ps1 b/...Public/Entrypoints/Invoke-ListDevices.ps1 → ...s/Endpoint/Reports/Invoke-ListDevices.ps1
diff --git a/...c/Entrypoints/Invoke-ExecDeviceDelete.ps1 → ...ation/Devices/Invoke-ExecDeviceDelete.ps1 b/...c/Entrypoints/Invoke-ExecDeviceDelete.ps1 → ...ation/Devices/Invoke-ExecDeviceDelete.ps1
diff --git a/...re/Public/Entrypoints/Invoke-AddGroup.ps1 → ...Administration/Groups/Invoke-AddGroup.ps1 b/...re/Public/Entrypoints/Invoke-AddGroup.ps1 → ...Administration/Groups/Invoke-AddGroup.ps1
diff --git a/...c/Entrypoints/Invoke-AddGroupTemplate.ps1 → ...ration/Groups/Invoke-AddGroupTemplate.ps1 b/...c/Entrypoints/Invoke-AddGroupTemplate.ps1 → ...ration/Groups/Invoke-AddGroupTemplate.ps1
diff --git a/...e/Public/Entrypoints/Invoke-EditGroup.ps1 → ...dministration/Groups/Invoke-EditGroup.ps1 b/...e/Public/Entrypoints/Invoke-EditGroup.ps1 → ...dministration/Groups/Invoke-EditGroup.ps1
diff --git a/...re/Public/Entrypoints/Invoke-AddGuest.ps1 → .../Administration/Users/Invoke-AddGuest.ps1 b/...re/Public/Entrypoints/Invoke-AddGuest.ps1 → .../Administration/Users/Invoke-AddGuest.ps1
diff --git a/...ore/Public/Entrypoints/Invoke-AddUser.ps1 → ...y/Administration/Users/Invoke-AddUser.ps1 b/...ore/Public/Entrypoints/Invoke-AddUser.ps1 → ...y/Administration/Users/Invoke-AddUser.ps1
diff --git a/...Public/Entrypoints/Invoke-AddUserBulk.ps1 → ...ministration/Users/Invoke-AddUserBulk.ps1 b/...Public/Entrypoints/Invoke-AddUserBulk.ps1 → ...ministration/Users/Invoke-AddUserBulk.ps1
diff --git a/...re/Public/Entrypoints/Invoke-EditUser.ps1 → .../Administration/Users/Invoke-EditUser.ps1 b/...re/Public/Entrypoints/Invoke-EditUser.ps1 → .../Administration/Users/Invoke-EditUser.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecBECCheck.ps1 → ...inistration/Users/Invoke-ExecBECCheck.ps1 b/...ublic/Entrypoints/Invoke-ExecBECCheck.ps1 → ...inistration/Users/Invoke-ExecBECCheck.ps1
diff --git a/...c/Entrypoints/Invoke-ExecBECRemediate.ps1 → ...tration/Users/Invoke-ExecBECRemediate.ps1 b/...c/Entrypoints/Invoke-ExecBECRemediate.ps1 → ...tration/Users/Invoke-ExecBECRemediate.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecClrImmId.ps1 → ...inistration/Users/Invoke-ExecClrImmId.ps1 b/...ublic/Entrypoints/Invoke-ExecClrImmId.ps1 → ...inistration/Users/Invoke-ExecClrImmId.ps1
diff --git a/...blic/Entrypoints/Invoke-ExecCreateTAP.ps1 → ...nistration/Users/Invoke-ExecCreateTAP.ps1 b/...blic/Entrypoints/Invoke-ExecCreateTAP.ps1 → ...nistration/Users/Invoke-ExecCreateTAP.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecDisableUser.ps1 → ...stration/Users/Invoke-ExecDisableUser.ps1 b/...ic/Entrypoints/Invoke-ExecDisableUser.ps1 → ...stration/Users/Invoke-ExecDisableUser.ps1
diff --git a/...c/Entrypoints/Invoke-ExecOffboardUser.ps1 → ...tration/Users/Invoke-ExecOffboardUser.ps1 b/...c/Entrypoints/Invoke-ExecOffboardUser.ps1 → ...tration/Users/Invoke-ExecOffboardUser.ps1
diff --git a/...nvoke-ExecOffboard_Mailboxpermissions.ps1 → ...nvoke-ExecOffboard_Mailboxpermissions.ps1 b/...nvoke-ExecOffboard_Mailboxpermissions.ps1 → ...nvoke-ExecOffboard_Mailboxpermissions.ps1
diff --git a/...trypoints/Invoke-ExecOneDriveShortCut.ps1 → ...ion/Users/Invoke-ExecOneDriveShortCut.ps1 b/...trypoints/Invoke-ExecOneDriveShortCut.ps1 → ...ion/Users/Invoke-ExecOneDriveShortCut.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecResetMFA.ps1 → ...inistration/Users/Invoke-ExecResetMFA.ps1 b/...ublic/Entrypoints/Invoke-ExecResetMFA.ps1 → ...inistration/Users/Invoke-ExecResetMFA.ps1
diff --git a/...blic/Entrypoints/Invoke-ExecResetPass.ps1 → ...nistration/Users/Invoke-ExecResetPass.ps1 b/...blic/Entrypoints/Invoke-ExecResetPass.ps1 → ...nistration/Users/Invoke-ExecResetPass.ps1
diff --git a/...Entrypoints/Invoke-ExecRevokeSessions.ps1 → ...ation/Users/Invoke-ExecRevokeSessions.ps1 b/...Entrypoints/Invoke-ExecRevokeSessions.ps1 → ...ation/Users/Invoke-ExecRevokeSessions.ps1
diff --git a/...ublic/Entrypoints/Invoke-ExecSendPush.ps1 → ...inistration/Users/Invoke-ExecSendPush.ps1 b/...ublic/Entrypoints/Invoke-ExecSendPush.ps1 → ...inistration/Users/Invoke-ExecSendPush.ps1
diff --git a/...oke-ListUserConditionalAccessPolicies.ps1 → ...oke-ListUserConditionalAccessPolicies.ps1 b/...oke-ListUserConditionalAccessPolicies.ps1 → ...oke-ListUserConditionalAccessPolicies.ps1
diff --git a/...lic/Entrypoints/Invoke-ListUserCounts.ps1 → ...istration/Users/Invoke-ListUserCounts.ps1 b/...lic/Entrypoints/Invoke-ListUserCounts.ps1 → ...istration/Users/Invoke-ListUserCounts.ps1
diff --git a/...ic/Entrypoints/Invoke-ListUserDevices.ps1 → ...stration/Users/Invoke-ListUserDevices.ps1 b/...ic/Entrypoints/Invoke-ListUserDevices.ps1 → ...stration/Users/Invoke-ListUserDevices.ps1
diff --git a/...lic/Entrypoints/Invoke-ListUserGroups.ps1 → ...istration/Users/Invoke-ListUserGroups.ps1 b/...lic/Entrypoints/Invoke-ListUserGroups.ps1 → ...istration/Users/Invoke-ListUserGroups.ps1
diff --git a/...ypoints/Invoke-ListUserMailboxDetails.ps1 → ...n/Users/Invoke-ListUserMailboxDetails.ps1 b/...ypoints/Invoke-ListUserMailboxDetails.ps1 → ...n/Users/Invoke-ListUserMailboxDetails.ps1
diff --git a/...trypoints/Invoke-ListUserMailboxRules.ps1 → ...ion/Users/Invoke-ListUserMailboxRules.ps1 b/...trypoints/Invoke-ListUserMailboxRules.ps1 → ...ion/Users/Invoke-ListUserMailboxRules.ps1
diff --git a/...blic/Entrypoints/Invoke-ListUserPhoto.ps1 → ...nistration/Users/Invoke-ListUserPhoto.ps1 b/...blic/Entrypoints/Invoke-ListUserPhoto.ps1 → ...nistration/Users/Invoke-ListUserPhoto.ps1
diff --git a/...c/Entrypoints/Invoke-ListUserSettings.ps1 → ...tration/Users/Invoke-ListUserSettings.ps1 b/...c/Entrypoints/Invoke-ListUserSettings.ps1 → ...tration/Users/Invoke-ListUserSettings.ps1
diff --git a/...Entrypoints/Invoke-ListUserSigninLogs.ps1 → ...ation/Users/Invoke-ListUserSigninLogs.ps1 b/...Entrypoints/Invoke-ListUserSigninLogs.ps1 → ...ation/Users/Invoke-ListUserSigninLogs.ps1
diff --git a/...e/Public/Entrypoints/Invoke-ListUsers.ps1 → ...Administration/Users/Invoke-ListUsers.ps1 b/...e/Public/Entrypoints/Invoke-ListUsers.ps1 → ...Administration/Users/Invoke-ListUsers.ps1
diff --git a/...blic/Entrypoints/Invoke-ListBasicAuth.ps1 → ...Identity/Reports/Invoke-ListBasicAuth.ps1 b/...blic/Entrypoints/Invoke-ListBasicAuth.ps1 → ...Identity/Reports/Invoke-ListBasicAuth.ps1
diff --git a/...points/Invoke-ListBasicAuthAllTenants.ps1 → ...eports/Invoke-ListBasicAuthAllTenants.ps1 b/...points/Invoke-ListBasicAuthAllTenants.ps1 → ...eports/Invoke-ListBasicAuthAllTenants.ps1
diff --git a/.../Entrypoints/Invoke-Z_CIPPHttpTrigger.ps1 → ...TP Functions/Invoke-Z_CIPPHttpTrigger.ps1 b/.../Entrypoints/Invoke-Z_CIPPHttpTrigger.ps1 → ...TP Functions/Invoke-Z_CIPPHttpTrigger.ps1
diff --git a/...oints/Invoke-ExecAlertsListAllTenants.ps1 → ...urity/Invoke-ExecAlertsListAllTenants.ps1 b/...oints/Invoke-ExecAlertsListAllTenants.ps1 → ...urity/Invoke-ExecAlertsListAllTenants.ps1
diff --git a/.../Entrypoints/Invoke-ExecIncidentsList.ps1 → ...ons/Security/Invoke-ExecIncidentsList.ps1 b/.../Entrypoints/Invoke-ExecIncidentsList.ps1 → ...ons/Security/Invoke-ExecIncidentsList.ps1
diff --git a/...ts/Invoke-ExecIncidentsListAllTenants.ps1 → ...ty/Invoke-ExecIncidentsListAllTenants.ps1 b/...ts/Invoke-ExecIncidentsListAllTenants.ps1 → ...ty/Invoke-ExecIncidentsListAllTenants.ps1
diff --git a/...trypoints/Invoke-ExecSetSecurityAlert.ps1 → .../Security/Invoke-ExecSetSecurityAlert.ps1 b/...trypoints/Invoke-ExecSetSecurityAlert.ps1 → .../Security/Invoke-ExecSetSecurityAlert.ps1
diff --git a/...points/Invoke-ExecSetSecurityIncident.ps1 → ...curity/Invoke-ExecSetSecurityIncident.ps1 b/...points/Invoke-ExecSetSecurityIncident.ps1 → ...curity/Invoke-ExecSetSecurityIncident.ps1
diff --git a/...ore/Public/Entrypoints/Invoke-AddTeam.ps1 → ...tions/Teams-Sharepoint/Invoke-AddTeam.ps1 b/...ore/Public/Entrypoints/Invoke-AddTeam.ps1 → ...tions/Teams-Sharepoint/Invoke-AddTeam.ps1
diff --git a/...points/Invoke-ExecSetSharePointMember.ps1 → ...epoint/Invoke-ExecSetSharePointMember.ps1 b/...points/Invoke-ExecSetSharePointMember.ps1 → ...epoint/Invoke-ExecSetSharePointMember.ps1
diff --git a/...ntrypoints/Invoke-ExecSharePointOwner.ps1 → ...Sharepoint/Invoke-ExecSharePointOwner.ps1 b/...ntrypoints/Invoke-ExecSharePointOwner.ps1 → ...Sharepoint/Invoke-ExecSharePointOwner.ps1
diff --git a/...ypoints/Invoke-ListSharepointSettings.ps1 → ...repoint/Invoke-ListSharepointSettings.ps1 b/...ypoints/Invoke-ListSharepointSettings.ps1 → ...repoint/Invoke-ListSharepointSettings.ps1
diff --git a/...e/Public/Entrypoints/Invoke-ListSites.ps1 → ...ons/Teams-Sharepoint/Invoke-ListSites.ps1 b/...e/Public/Entrypoints/Invoke-ListSites.ps1 → ...ons/Teams-Sharepoint/Invoke-ListSites.ps1
diff --git a/...e/Public/Entrypoints/Invoke-ListTeams.ps1 → ...ons/Teams-Sharepoint/Invoke-ListTeams.ps1 b/...e/Public/Entrypoints/Invoke-ListTeams.ps1 → ...ons/Teams-Sharepoint/Invoke-ListTeams.ps1
diff --git a/.../Entrypoints/Invoke-ListTeamsActivity.ps1 → ...s-Sharepoint/Invoke-ListTeamsActivity.ps1 b/.../Entrypoints/Invoke-ListTeamsActivity.ps1 → ...s-Sharepoint/Invoke-ListTeamsActivity.ps1
diff --git a/...lic/Entrypoints/Invoke-ListTeamsVoice.ps1 → ...eams-Sharepoint/Invoke-ListTeamsVoice.ps1 b/...lic/Entrypoints/Invoke-ListTeamsVoice.ps1 → ...eams-Sharepoint/Invoke-ListTeamsVoice.ps1
diff --git a/...re/Public/Entrypoints/Invoke-AddAlert.ps1 → ...Administration/Alerts/Invoke-AddAlert.ps1 b/...re/Public/Entrypoints/Invoke-AddAlert.ps1 → ...Administration/Alerts/Invoke-AddAlert.ps1
diff --git a/...lic/Entrypoints/Invoke-ExecAlertsList.ps1 → ...stration/Alerts/Invoke-ExecAlertsList.ps1 b/...lic/Entrypoints/Invoke-ExecAlertsList.ps1 → ...stration/Alerts/Invoke-ExecAlertsList.ps1
diff --git a/...c/Entrypoints/Invoke-ListWebhookAlert.ps1 → ...ration/Alerts/Invoke-ListWebhookAlert.ps1 b/...c/Entrypoints/Invoke-ListWebhookAlert.ps1 → ...ration/Alerts/Invoke-ListWebhookAlert.ps1
diff --git a/...lic/Entrypoints/Invoke-PublicWebhooks.ps1 → ...stration/Alerts/Invoke-PublicWebhooks.ps1 b/...lic/Entrypoints/Invoke-PublicWebhooks.ps1 → ...stration/Alerts/Invoke-PublicWebhooks.ps1
diff --git a/...rypoints/Invoke-ExecAddMultiTenantApp.ps1 → ...Approval/Invoke-ExecAddMultiTenantApp.ps1 b/...rypoints/Invoke-ExecAddMultiTenantApp.ps1 → ...Approval/Invoke-ExecAddMultiTenantApp.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecAppApproval.ps1 → ...ation Approval/Invoke-ExecAppApproval.ps1 b/...ic/Entrypoints/Invoke-ExecAppApproval.ps1 → ...ation Approval/Invoke-ExecAppApproval.ps1
diff --git a/.../Public/Entrypoints/Invoke-ExecAddSPN.ps1 → ...nant/Administration/Invoke-ExecAddSPN.ps1 b/.../Public/Entrypoints/Invoke-ExecAddSPN.ps1 → ...nant/Administration/Invoke-ExecAddSPN.ps1
diff --git a/...Entrypoints/Invoke-ExecOffboardTenant.ps1 → ...inistration/Invoke-ExecOffboardTenant.ps1 b/...Entrypoints/Invoke-ExecOffboardTenant.ps1 → ...inistration/Invoke-ExecOffboardTenant.ps1
diff --git a/.../Entrypoints/Invoke-ExecOnboardTenant.ps1 → ...ministration/Invoke-ExecOnboardTenant.ps1 b/.../Entrypoints/Invoke-ExecOnboardTenant.ps1 → ...ministration/Invoke-ExecOnboardTenant.ps1
diff --git a/...ypoints/Invoke-ListAppConsentRequests.ps1 → ...tration/Invoke-ListAppConsentRequests.ps1 b/...ypoints/Invoke-ListAppConsentRequests.ps1 → ...tration/Invoke-ListAppConsentRequests.ps1
diff --git a/.../Public/Entrypoints/Invoke-EditTenant.ps1 → ...ministration/Tenant/Invoke-EditTenant.ps1 b/.../Public/Entrypoints/Invoke-EditTenant.ps1 → ...ministration/Tenant/Invoke-EditTenant.ps1
diff --git a/.../Entrypoints/Invoke-ListTenantDetails.ps1 → ...ation/Tenant/Invoke-ListTenantDetails.ps1 b/.../Entrypoints/Invoke-ListTenantDetails.ps1 → ...ation/Tenant/Invoke-ListTenantDetails.ps1
diff --git a/...Public/Entrypoints/Invoke-ListTenants.ps1 → ...inistration/Tenant/Invoke-ListTenants.ps1 b/...Public/Entrypoints/Invoke-ListTenants.ps1 → ...inistration/Tenant/Invoke-ListTenants.ps1
@@ -21,16 +21,22 @@ Function Invoke-ListTenants {
                 StatusCode = [HttpStatusCode]::OK
                 Body       = $GraphRequest
             })
+        $InputObject = [PSCustomObject]@{
+            OrchestratorName = 'UpdateTenantsOrchestrator'
+            Batch            = @(@{'FunctionName' = 'UpdateTenants' })
+        }
+        #Write-Host ($InputObject | ConvertTo-Json)
+        $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5)
         exit
     }
 
     try {
         $tenantfilter = $Request.Query.TenantFilter
-        $Tenants = Get-Tenants -IncludeErrors
+        $Tenants = Get-Tenants -IncludeErrors -SkipDomains
 
         if ($null -eq $TenantFilter -or $TenantFilter -eq 'null') {
             $TenantList = [system.collections.generic.list[object]]::new()
-            if ($Request.Query.AllTenantSelector -eq $true) { 
+            if ($Request.Query.AllTenantSelector -eq $true) {
                 $TenantList.Add(@{
                         customerId        = 'AllTenants'
                         defaultDomainName = 'AllTenants'
@@ -55,7 +61,7 @@ Function Invoke-ListTenants {
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -tenant $Tenantfilter -API $APINAME -message 'Listed Tenant Details' -Sev 'Debug'
     } catch {
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -tenant $Tenantfilter -API $APINAME -message "List Tenant failed. The error is: $($_.Exception.Message)" -Sev 'Error'
-        $body = [pscustomobject]@{ 
+        $body = [pscustomobject]@{
             'Results'         = "Failed to retrieve tenants: $($_.Exception.Message)"
             defaultDomainName = ''
             displayName       = 'Failed to retrieve tenants. Perform a permission check.'
@@ -68,6 +74,6 @@ Function Invoke-ListTenants {
             StatusCode = [HttpStatusCode]::OK
             Body       = @($Body)
         })
-    
+
 
 }
diff --git a/...Public/Entrypoints/Invoke-AddCAPolicy.ps1 → ...Tenant/Conditional/Invoke-AddCAPolicy.ps1 b/...Public/Entrypoints/Invoke-AddCAPolicy.ps1 → ...Tenant/Conditional/Invoke-AddCAPolicy.ps1
diff --git a/...blic/Entrypoints/Invoke-AddCATemplate.ps1 → ...nant/Conditional/Invoke-AddCATemplate.ps1 b/...blic/Entrypoints/Invoke-AddCATemplate.ps1 → ...nant/Conditional/Invoke-AddCATemplate.ps1
diff --git a/...c/Entrypoints/Invoke-AddNamedLocation.ps1 → ...t/Conditional/Invoke-AddNamedLocation.ps1 b/...c/Entrypoints/Invoke-AddNamedLocation.ps1 → ...t/Conditional/Invoke-AddNamedLocation.ps1
diff --git a/...ublic/Entrypoints/Invoke-EditCAPolicy.ps1 → ...enant/Conditional/Invoke-EditCAPolicy.ps1 b/...ublic/Entrypoints/Invoke-EditCAPolicy.ps1 → ...enant/Conditional/Invoke-EditCAPolicy.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecCAExclusion.ps1 → ...nt/Conditional/Invoke-ExecCAExclusion.ps1 b/...ic/Entrypoints/Invoke-ExecCAExclusion.ps1 → ...nt/Conditional/Invoke-ExecCAExclusion.ps1
diff --git a/...ic/Entrypoints/Invoke-ListCAtemplates.ps1 → ...nt/Conditional/Invoke-ListCAtemplates.ps1 b/...ic/Entrypoints/Invoke-ListCAtemplates.ps1 → ...nt/Conditional/Invoke-ListCAtemplates.ps1
diff --git a/.../Invoke-ListConditionalAccessPolicies.ps1 → .../Invoke-ListConditionalAccessPolicies.ps1 b/.../Invoke-ListConditionalAccessPolicies.ps1 → .../Invoke-ListConditionalAccessPolicies.ps1
diff --git a/...ke-ListConditionalAccessPolicyChanges.ps1 → ...ke-ListConditionalAccessPolicyChanges.ps1 b/...ke-ListConditionalAccessPolicyChanges.ps1 → ...ke-ListConditionalAccessPolicyChanges.ps1
diff --git a/...ic/Entrypoints/Invoke-ExecAddGDAPRole.ps1 → ...ns/Tenant/GDAP/Invoke-ExecAddGDAPRole.ps1 b/...ic/Entrypoints/Invoke-ExecAddGDAPRole.ps1 → ...ns/Tenant/GDAP/Invoke-ExecAddGDAPRole.ps1
diff --git a/...Entrypoints/Invoke-ExecAutoExtendGDAP.ps1 → ...Tenant/GDAP/Invoke-ExecAutoExtendGDAP.ps1 b/...Entrypoints/Invoke-ExecAutoExtendGDAP.ps1 → ...Tenant/GDAP/Invoke-ExecAutoExtendGDAP.ps1
diff --git a/...PCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecDeleteGDAPRelationship.ps1 b/...PCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecDeleteGDAPRelationship.ps1
@@ -0,0 +1,31 @@
+using namespace System.Net
+
+Function Invoke-ExecDeleteGDAPRelationship {
+    <#
+    .FUNCTIONALITY
+    Entrypoint
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $TriggerMetadata.FunctionName
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+    # Interact with query parameters or the body of the request.
+    $GDAPID = $request.query.GDAPId
+    try {
+        $DELETE = New-GraphPostRequest -NoAuthCheck $True -uri "https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminRelationships/$($GDAPID)/requests" -type POST -body '{"action":"terminate"}' -tenantid $env:TenantID
+        $Results = [pscustomobject]@{'Results' = "Success. GDAP relationship for $($GDAPID) been revoked" }
+        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Success. GDAP relationship for $($GDAPID) been revoked" -Sev 'Info'
+
+    } catch {
+        $Results = [pscustomobject]@{'Results' = "Failed. $($_.Exception.Message)" }
+    }
+
+    # Associate values to output bindings by calling 'Push-OutputBinding'.
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = $Results
+        })
+
+}
diff --git a/...ints/Invoke-ExecDeleteGDAPRoleMapping.ps1 → ...GDAP/Invoke-ExecDeleteGDAPRoleMapping.ps1 b/...ints/Invoke-ExecDeleteGDAPRoleMapping.ps1 → ...GDAP/Invoke-ExecDeleteGDAPRoleMapping.ps1
diff --git a/...lic/Entrypoints/Invoke-ExecGDAPInvite.ps1 → ...ons/Tenant/GDAP/Invoke-ExecGDAPInvite.ps1 b/...lic/Entrypoints/Invoke-ExecGDAPInvite.ps1 → ...ons/Tenant/GDAP/Invoke-ExecGDAPInvite.ps1
diff --git a/...ypoints/Invoke-ExecGDAPInviteApproved.ps1 → ...nt/GDAP/Invoke-ExecGDAPInviteApproved.ps1 b/...ypoints/Invoke-ExecGDAPInviteApproved.ps1 → ...nt/GDAP/Invoke-ExecGDAPInviteApproved.ps1
diff --git a/...lic/Entrypoints/Invoke-ListGDAPInvite.ps1 → ...ons/Tenant/GDAP/Invoke-ListGDAPInvite.ps1 b/...lic/Entrypoints/Invoke-ListGDAPInvite.ps1 → ...ons/Tenant/GDAP/Invoke-ListGDAPInvite.ps1
diff --git a/...blic/Entrypoints/Invoke-ListGDAPQueue.ps1 → ...ions/Tenant/GDAP/Invoke-ListGDAPQueue.ps1 b/...blic/Entrypoints/Invoke-ListGDAPQueue.ps1 → ...ions/Tenant/GDAP/Invoke-ListGDAPQueue.ps1
diff --git a/...blic/Entrypoints/Invoke-ListGDAPRoles.ps1 → ...ions/Tenant/GDAP/Invoke-ListGDAPRoles.ps1 b/...blic/Entrypoints/Invoke-ListGDAPRoles.ps1 → ...ions/Tenant/GDAP/Invoke-ListGDAPRoles.ps1
diff --git a/...Entrypoints/Invoke-AddStandardsDeploy.ps1 → ...t/Standards/Invoke-AddStandardsDeploy.ps1 b/...Entrypoints/Invoke-AddStandardsDeploy.ps1 → ...t/Standards/Invoke-AddStandardsDeploy.ps1
diff --git a/...ints/Invoke-BestPracticeAnalyser_List.ps1 → ...ards/Invoke-BestPracticeAnalyser_List.ps1 b/...ints/Invoke-BestPracticeAnalyser_List.ps1 → ...ards/Invoke-BestPracticeAnalyser_List.ps1
diff --git a/...c/Entrypoints/Invoke-ExecStandardsRun.ps1 → ...ant/Standards/Invoke-ExecStandardsRun.ps1 b/...c/Entrypoints/Invoke-ExecStandardsRun.ps1 → ...ant/Standards/Invoke-ExecStandardsRun.ps1
diff --git a/...ore/Public/Entrypoints/Invoke-ListBPA.ps1 → ...tions/Tenant/Standards/Invoke-ListBPA.ps1 b/...ore/Public/Entrypoints/Invoke-ListBPA.ps1 → ...tions/Tenant/Standards/Invoke-ListBPA.ps1
diff --git a/...c/Entrypoints/Invoke-ListBPATemplates.ps1 → ...ant/Standards/Invoke-ListBPATemplates.ps1 b/...c/Entrypoints/Invoke-ListBPATemplates.ps1 → ...ant/Standards/Invoke-ListBPATemplates.ps1
diff --git a/...Entrypoints/Invoke-ListDomainAnalyser.ps1 → ...t/Standards/Invoke-ListDomainAnalyser.ps1 b/...Entrypoints/Invoke-ListDomainAnalyser.ps1 → ...t/Standards/Invoke-ListDomainAnalyser.ps1
diff --git a/...c/Entrypoints/Invoke-ListDomainHealth.ps1 → ...ant/Standards/Invoke-ListDomainHealth.ps1 b/...c/Entrypoints/Invoke-ListDomainHealth.ps1 → ...ant/Standards/Invoke-ListDomainHealth.ps1
diff --git a/...ntrypoints/invoke-DomainAnalyser_List.ps1 → .../Standards/invoke-DomainAnalyser_List.ps1 b/...ntrypoints/invoke-DomainAnalyser_List.ps1 → .../Standards/invoke-DomainAnalyser_List.ps1
diff --git a/...points/Invoke-ExecGraphExplorerPreset.ps1 → .../Tools/Invoke-ExecGraphExplorerPreset.ps1 b/...points/Invoke-ExecGraphExplorerPreset.ps1 → .../Tools/Invoke-ExecGraphExplorerPreset.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-AddChocoApp_OrchestrationStarter.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-AddChocoApp_OrchestrationStarter.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecDeleteGDAPRelationship.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecDeleteGDAPRelationship.ps1