diff --git a/AccessChecks/function.json b/ExecAccessChecks/function.json
similarity index 100%
rename from AccessChecks/function.json
rename to ExecAccessChecks/function.json
diff --git a/AccessChecks/run.ps1 b/ExecAccessChecks/run.ps1
similarity index 100%
rename from AccessChecks/run.ps1
rename to ExecAccessChecks/run.ps1
diff --git a/AssignApp/function.json b/ExecAssignApp/function.json
similarity index 100%
rename from AssignApp/function.json
rename to ExecAssignApp/function.json
diff --git a/AssignApp/run.ps1 b/ExecAssignApp/run.ps1
similarity index 100%
rename from AssignApp/run.ps1
rename to ExecAssignApp/run.ps1
diff --git a/ConverttoSharedMailbox/function.json b/ExecConverttoSharedMailbox/function.json
similarity index 100%
rename from ConverttoSharedMailbox/function.json
rename to ExecConverttoSharedMailbox/function.json
diff --git a/ConverttoSharedMailbox/run.ps1 b/ExecConverttoSharedMailbox/run.ps1
similarity index 100%
rename from ConverttoSharedMailbox/run.ps1
rename to ExecConverttoSharedMailbox/run.ps1
diff --git a/DisableUser/function.json b/ExecDisableUser/function.json
similarity index 100%
rename from DisableUser/function.json
rename to ExecDisableUser/function.json
diff --git a/DisableUser/run.ps1 b/ExecDisableUser/run.ps1
similarity index 100%
rename from DisableUser/run.ps1
rename to ExecDisableUser/run.ps1
diff --git a/ExcludeTenant/function.json b/ExecExcludeTenant/function.json
similarity index 100%
rename from ExcludeTenant/function.json
rename to ExecExcludeTenant/function.json
diff --git a/ExcludeTenant/run.ps1 b/ExecExcludeTenant/run.ps1
similarity index 100%
rename from ExcludeTenant/run.ps1
rename to ExecExcludeTenant/run.ps1
diff --git a/Logs/function.json b/ExecOffboardUser/function.json
similarity index 100%
rename from Logs/function.json
rename to ExecOffboardUser/function.json
diff --git a/OffboardUser/run.ps1 b/ExecOffboardUser/run.ps1
similarity index 100%
rename from OffboardUser/run.ps1
rename to ExecOffboardUser/run.ps1
diff --git a/NotifyEmail/function.json b/ExecResetPass/function.json
similarity index 100%
rename from NotifyEmail/function.json
rename to ExecResetPass/function.json
diff --git a/ResetPass/run.ps1 b/ExecResetPass/run.ps1
similarity index 100%
rename from ResetPass/run.ps1
rename to ExecResetPass/run.ps1
diff --git a/NotifyTeams/function.json b/ExecSendPush/function.json
similarity index 100%
rename from NotifyTeams/function.json
rename to ExecSendPush/function.json
diff --git a/SendPush/run.ps1 b/ExecSendPush/run.ps1
similarity index 100%
rename from SendPush/run.ps1
rename to ExecSendPush/run.ps1
diff --git a/OffboardUser/function.json b/ListLogs/function.json
similarity index 100%
rename from OffboardUser/function.json
rename to ListLogs/function.json
diff --git a/Logs/run.ps1 b/ListLogs/run.ps1
similarity index 100%
rename from Logs/run.ps1
rename to ListLogs/run.ps1
diff --git a/NotifyEmail/run.ps1 b/NotifyEmail/run.ps1
deleted file mode 100644
index e1a20af4be1a..000000000000
--- a/NotifyEmail/run.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-using namespace System.Net
-
-# Input bindings are passed in via param block.
-param($Request, $TriggerMetadata)
-
-$APIName = $TriggerMetadata.FunctionName
-Log-Request -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."
-
-# Interact with query parameters or the body of the request.
-$TenantFilter = $Request.Query.TenantFilter
-if ($TenantFilter) {
-    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999" -tenantid $TenantFilter
-}
-else {
-    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999"
-}
-
-
-# Associate values to output bindings by calling 'Push-OutputBinding'.
-Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-        StatusCode = [HttpStatusCode]::OK
-        Body       = $GraphRequest
-    })
\ No newline at end of file
diff --git a/NotifyTeams/run.ps1 b/NotifyTeams/run.ps1
deleted file mode 100644
index e1a20af4be1a..000000000000
--- a/NotifyTeams/run.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-using namespace System.Net
-
-# Input bindings are passed in via param block.
-param($Request, $TriggerMetadata)
-
-$APIName = $TriggerMetadata.FunctionName
-Log-Request -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."
-
-# Interact with query parameters or the body of the request.
-$TenantFilter = $Request.Query.TenantFilter
-if ($TenantFilter) {
-    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999" -tenantid $TenantFilter
-}
-else {
-    $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999"
-}
-
-
-# Associate values to output bindings by calling 'Push-OutputBinding'.
-Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-        StatusCode = [HttpStatusCode]::OK
-        Body       = $GraphRequest
-    })
\ No newline at end of file
diff --git a/ResetPass/function.json b/ResetPass/function.json
deleted file mode 100644
index 306b0c51e560..000000000000
--- a/ResetPass/function.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "anonymous",
-      "type": "httpTrigger",
-      "direction": "in",
-      "name": "Request",
-      "methods": [
-        "get",
-        "post"
-      ]
-    },
-    {
-      "type": "http",
-      "direction": "out",
-      "name": "Response"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/SendPush/function.json b/SendPush/function.json
deleted file mode 100644
index 306b0c51e560..000000000000
--- a/SendPush/function.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "anonymous",
-      "type": "httpTrigger",
-      "direction": "in",
-      "name": "Request",
-      "methods": [
-        "get",
-        "post"
-      ]
-    },
-    {
-      "type": "http",
-      "direction": "out",
-      "name": "Response"
-    }
-  ]
-}
\ No newline at end of file