diff --git a/pom.xml b/pom.xml
index cc4f6e7e37035..5afc9c9ad8477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
     <module>sdk/eventgrid</module>
     <module>sdk/eventhubs</module>
     <module>sdk/extendedlocation</module>
-    <module>sdk/face</module>
     <module>sdk/fluidrelay</module>
     <module>sdk/formrecognizer</module>
     <module>sdk/frontdoor</module>
diff --git a/sdk/face/azure-ai-vision-face/assets.json b/sdk/face/azure-ai-vision-face/assets.json
deleted file mode 100644
index d3ac2d6806ef1..0000000000000
--- a/sdk/face/azure-ai-vision-face/assets.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "AssetsRepo" : "Azure/azure-sdk-assets",
-  "AssetsRepoPrefixPath" : "java",
-  "TagPrefix" : "java/face/azure-ai-vision-face",
-  "Tag" : "java/face/azure-ai-vision-face_9ce33a3187"
-}
diff --git a/sdk/face/pom.xml b/sdk/face/pom.xml
deleted file mode 100644
index 7e9168039275e..0000000000000
--- a/sdk/face/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved.
-     Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.azure</groupId>
-  <artifactId>azure-face-service</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-
-  <modules>
-    <module>azure-ai-vision-face</module>
-  </modules>
-</project>
diff --git a/sdk/face/azure-ai-vision-face/CHANGELOG.md b/sdk/vision/azure-ai-vision-face/CHANGELOG.md
similarity index 100%
rename from sdk/face/azure-ai-vision-face/CHANGELOG.md
rename to sdk/vision/azure-ai-vision-face/CHANGELOG.md
diff --git a/sdk/face/azure-ai-vision-face/README.md b/sdk/vision/azure-ai-vision-face/README.md
similarity index 95%
rename from sdk/face/azure-ai-vision-face/README.md
rename to sdk/vision/azure-ai-vision-face/README.md
index 67ac90faf5316..4e5aed1de3a70 100644
--- a/sdk/face/azure-ai-vision-face/README.md
+++ b/sdk/vision/azure-ai-vision-face/README.md
@@ -387,11 +387,11 @@ For details on contributing to this repository, see the [contributing guide](htt
 
 
 <!-- LINKS -->
-[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/
+[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/
 [face_java_package_maven]: https://central.sonatype.com/artifact/com.azure/azure-ai-vision-face/
 [face_ref_java_docs]: https://aka.ms/azsdk-java-face-ref
 [face_product_docs]: https://learn.microsoft.com/azure/ai-services/computer-vision/overview-identity
-[face_samples]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/samples
+[face_samples]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/samples
 
 [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
 [azure_sub]: https://azure.microsoft.com/free/
@@ -406,15 +406,15 @@ For details on contributing to this repository, see the [contributing guide](htt
 [regional_endpoints]: https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services
 [azure_sdk_java_azure_key_credential]: https://learn.microsoft.com/java/api/com.azure.core.credential.azurekeycredential?view=azure-java-stable
 
-[face_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
-[face_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
-[face_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java
-[face_administration_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java
-[face_administration_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java
-[face_administration_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java
-[face_session_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java
-[face_session_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
-[face_session_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java
+[face_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
+[face_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
+[face_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java
+[face_administration_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java
+[face_administration_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java
+[face_administration_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java
+[face_session_client_async]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java
+[face_session_client]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
+[face_session_client_builder]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java
 
 [azure_sdk_java_identity]: https://learn.microsoft.com/azure/developer/java/sdk/identity
 [custom_subdomain]: https://docs.microsoft.com/azure/cognitive-services/authentication#create-a-resource-with-a-custom-subdomain
diff --git a/sdk/vision/azure-ai-vision-face/assets.json b/sdk/vision/azure-ai-vision-face/assets.json
new file mode 100644
index 0000000000000..b0764ef5eaf4a
--- /dev/null
+++ b/sdk/vision/azure-ai-vision-face/assets.json
@@ -0,0 +1,6 @@
+{
+  "AssetsRepo" : "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath" : "java",
+  "TagPrefix" : "java/vision/azure-ai-vision-face",
+  "Tag" : "java/vision/azure-ai-vision-face_b9618d1bba"
+}
diff --git a/sdk/face/ci.yml b/sdk/vision/azure-ai-vision-face/ci.yml
similarity index 65%
rename from sdk/face/ci.yml
rename to sdk/vision/azure-ai-vision-face/ci.yml
index 53f672288b7e4..3b43aa08f6e8a 100644
--- a/sdk/face/ci.yml
+++ b/sdk/vision/azure-ai-vision-face/ci.yml
@@ -8,11 +8,9 @@ trigger:
       - release/*
   paths:
     include:
-      - sdk/face/ci.yml
-      - sdk/face/azure-ai-vision-face/
+      - sdk/vision/azure-ai-vision-face/
     exclude:
-      - sdk/face/pom.xml
-      - sdk/face/azure-ai-vision-face/pom.xml
+      - sdk/vision/azure-ai-vision-face/pom.xml
 
 pr:
   branches:
@@ -23,11 +21,9 @@ pr:
       - release/*
   paths:
     include:
-      - sdk/face/ci.yml
-      - sdk/face/azure-ai-vision-face/
+      - sdk/vision/azure-ai-vision-face/
     exclude:
-      - sdk/face/pom.xml
-      - sdk/face/azure-ai-vision-face/pom.xml
+      - sdk/vision/azure-ai-vision-face/pom.xml
 
 parameters:
   - name: release_azureaivisionface
@@ -36,9 +32,9 @@ parameters:
     default: true
 
 extends:
-  template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+  template: ../../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
-    ServiceDirectory: face
+    ServiceDirectory: vision
     EnableBatchRelease: true
     Artifacts:
       - name: azure-ai-vision-face
diff --git a/sdk/face/azure-ai-vision-face/pom.xml b/sdk/vision/azure-ai-vision-face/pom.xml
similarity index 100%
rename from sdk/face/azure-ai-vision-face/pom.xml
rename to sdk/vision/azure-ai-vision-face/pom.xml
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationAsyncClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAdministrationClientBuilder.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClientBuilder.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceServiceVersion.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceServiceVersion.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceServiceVersion.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceServiceVersion.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionAsyncClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClient.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceSessionClientBuilder.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/ClientUtils.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/ClientUtils.java
old mode 100755
new mode 100644
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/ClientUtils.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/ClientUtils.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceAdministrationClientImpl.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceAdministrationClientImpl.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceAdministrationClientImpl.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceAdministrationClientImpl.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/MultipartFormDataHelper.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/MultipartFormDataHelper.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/MultipartFormDataHelper.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/MultipartFormDataHelper.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddFaceListFaceFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddFaceListFaceFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddFaceListFaceFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddFaceListFaceFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargeFaceListFaceFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargeFaceListFaceFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargeFaceListFaceFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargeFaceListFaceFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargePersonGroupPersonFaceFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargePersonGroupPersonFaceFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargePersonGroupPersonFaceFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddLargePersonGroupPersonFaceFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonFaceFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonFaceFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonFaceFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonFaceFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonGroupPersonFaceFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonGroupPersonFaceFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonGroupPersonFaceFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/AddPersonGroupPersonFaceFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupWithPersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupWithPersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupWithPersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateDynamicPersonGroupWithPersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargeFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargeFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargeFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargeFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupPersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupPersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupPersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupPersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLargePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLivenessWithVerifySessionContent.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLivenessWithVerifySessionContent.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLivenessWithVerifySessionContent.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreateLivenessWithVerifySessionContent.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupPersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupPersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupPersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupPersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/CreatePersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromLargeFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromLargeFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromLargeFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarFromLargeFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/FindSimilarRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/GroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/GroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/GroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/GroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromDynamicPersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromDynamicPersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromDynamicPersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromDynamicPersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromLargePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromLargePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromLargePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromLargePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonDirectoryRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonDirectoryRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonDirectoryRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonDirectoryRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/IdentifyFromPersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupWithPersonChangesRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupWithPersonChangesRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupWithPersonChangesRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateDynamicPersonGroupWithPersonChangesRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListFaceRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListFaceRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListFaceRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListFaceRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargeFaceListRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonFaceRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonFaceRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonFaceRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonFaceRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupPersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdateLargePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonFaceRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonFaceRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonFaceRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonFaceRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonFaceRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonFaceRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonFaceRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonFaceRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupPersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/UpdatePersonRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFaceToFaceRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFaceToFaceRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFaceToFaceRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFaceToFaceRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromLargePersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromLargePersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromLargePersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromLargePersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonDirectoryRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonDirectoryRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonDirectoryRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonDirectoryRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonGroupRequest.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonGroupRequest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonGroupRequest.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyFromPersonGroupRequest.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyImageFileDetails.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyImageFileDetails.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyImageFileDetails.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/VerifyImageFileDetails.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/package-info.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/package-info.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/package-info.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/package-info.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/package-info.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/package-info.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/package-info.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/package-info.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryItem.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryItem.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryItem.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryItem.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AccessoryType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AddFaceResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AddFaceResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AddFaceResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AddFaceResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditLivenessResponseInfo.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditLivenessResponseInfo.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditLivenessResponseInfo.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditLivenessResponseInfo.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditRequestInfo.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditRequestInfo.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditRequestInfo.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/AuditRequestInfo.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurLevel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurLevel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurLevel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurLevel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/BlurProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionContent.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionContent.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionContent.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionContent.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessSessionResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessWithVerifySessionResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessWithVerifySessionResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessWithVerifySessionResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreateLivenessWithVerifySessionResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreatePersonResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreatePersonResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreatePersonResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/CreatePersonResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DetectOptions.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DetectOptions.java
old mode 100755
new mode 100644
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DetectOptions.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DetectOptions.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DynamicPersonGroup.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DynamicPersonGroup.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DynamicPersonGroup.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/DynamicPersonGroup.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureLevel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureLevel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureLevel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureLevel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ExposureProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributeType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributeType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributeType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributeType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributes.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributes.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributes.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceAttributes.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceCollectionTrainingResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceCollectionTrainingResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceCollectionTrainingResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceCollectionTrainingResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionModel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionModel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionModel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionModel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceDetectionResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceFindSimilarResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceFindSimilarResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceFindSimilarResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceFindSimilarResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceGroupingResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceGroupingResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceGroupingResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceGroupingResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationCandidate.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationCandidate.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationCandidate.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationCandidate.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceIdentificationResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceImageType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceImageType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceImageType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceImageType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLandmarks.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLandmarks.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLandmarks.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLandmarks.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceList.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceList.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceList.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceList.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListFace.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListFace.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListFace.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListFace.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListItem.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListItem.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListItem.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceListItem.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLivenessDecision.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLivenessDecision.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLivenessDecision.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceLivenessDecision.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationStatus.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationStatus.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationStatus.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceOperationStatus.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRecognitionModel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRecognitionModel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRecognitionModel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRecognitionModel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRectangle.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRectangle.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRectangle.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceRectangle.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceSessionStatus.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceSessionStatus.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceSessionStatus.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceSessionStatus.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceVerificationResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceVerificationResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceVerificationResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FaceVerificationResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FacialHair.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FacialHair.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FacialHair.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FacialHair.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FindSimilarMatchMode.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FindSimilarMatchMode.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FindSimilarMatchMode.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/FindSimilarMatchMode.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/GlassesType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/GlassesType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/GlassesType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/GlassesType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColor.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColor.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColor.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColor.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColorType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColorType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColorType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairColorType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HairProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HeadPose.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HeadPose.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HeadPose.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/HeadPose.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LandmarkCoordinate.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LandmarkCoordinate.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LandmarkCoordinate.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LandmarkCoordinate.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceList.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceList.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceList.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceList.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceListFace.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceListFace.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceListFace.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargeFaceListFace.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroup.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroup.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroup.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroup.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPerson.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPerson.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPerson.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPerson.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPersonFace.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPersonFace.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPersonFace.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LargePersonGroupPersonFace.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListFaceResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListFaceResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListFaceResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListFaceResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListGroupReferenceResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListGroupReferenceResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListGroupReferenceResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListGroupReferenceResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListPersonResult.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListPersonResult.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListPersonResult.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/ListPersonResult.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessModel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessModel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessModel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessModel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOperationMode.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOperationMode.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOperationMode.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOperationMode.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOutputsTarget.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOutputsTarget.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOutputsTarget.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessOutputsTarget.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessResponseBody.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessResponseBody.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessResponseBody.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessResponseBody.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSession.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSession.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSession.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSession.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionAuditEntry.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionAuditEntry.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionAuditEntry.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionAuditEntry.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionItem.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionItem.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionItem.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessSessionItem.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyImage.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyImage.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyImage.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyImage.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyOutputs.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyOutputs.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyOutputs.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifyOutputs.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifySession.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifySession.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifySession.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/LivenessWithVerifySession.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskType.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskType.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskType.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/MaskType.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseLevel.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseLevel.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseLevel.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseLevel.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/NoiseProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/OcclusionProperties.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/OcclusionProperties.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/OcclusionProperties.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/OcclusionProperties.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryFace.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryFace.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryFace.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryFace.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryPerson.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryPerson.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryPerson.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonDirectoryPerson.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroup.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroup.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroup.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroup.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPerson.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPerson.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPerson.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPerson.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPersonFace.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPersonFace.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPersonFace.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/PersonGroupPersonFace.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/QualityForRecognition.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/QualityForRecognition.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/QualityForRecognition.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/QualityForRecognition.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/package-info.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/package-info.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/package-info.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/models/package-info.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/package-info.java b/sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/package-info.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/package-info.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/package-info.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/module-info.java b/sdk/vision/azure-ai-vision-face/src/main/java/module-info.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/java/module-info.java
rename to sdk/vision/azure-ai-vision-face/src/main/java/module-info.java
diff --git a/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json b/sdk/vision/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
rename to sdk/vision/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
diff --git a/sdk/face/azure-ai-vision-face/src/main/resources/azure-ai-vision-face.properties b/sdk/vision/azure-ai-vision-face/src/main/resources/azure-ai-vision-face.properties
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/main/resources/azure-ai-vision-face.properties
rename to sdk/vision/azure-ai-vision-face/src/main/resources/azure-ai-vision-face.properties
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/ReadmeSamples.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/ReadmeSamples.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/ReadmeSamples.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/ReadmeSamples.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/CleanAllDynamicPersonGroupAndPersonDirectoryPersons.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/CleanAllDynamicPersonGroupAndPersonDirectoryPersons.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/CleanAllDynamicPersonGroupAndPersonDirectoryPersons.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/CleanAllDynamicPersonGroupAndPersonDirectoryPersons.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFaces.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFaces.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFaces.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFaces.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java
similarity index 98%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java
index 9f314c2d32a8f..ec80e1c27c46f 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectFacesAsync.java
@@ -5,25 +5,23 @@
 
 import com.azure.ai.vision.face.FaceAsyncClient;
 import com.azure.ai.vision.face.FaceClientBuilder;
-import com.azure.ai.vision.face.samples.utils.ConfigurationHelper;
-import com.azure.ai.vision.face.samples.utils.Resources;
-import com.azure.ai.vision.face.samples.utils.Utils;
 import com.azure.ai.vision.face.models.DetectOptions;
 import com.azure.ai.vision.face.models.FaceDetectionModel;
 import com.azure.ai.vision.face.models.FaceDetectionResult;
 import com.azure.ai.vision.face.models.FaceRecognitionModel;
+import com.azure.ai.vision.face.samples.utils.ConfigurationHelper;
+import com.azure.ai.vision.face.samples.utils.Resources;
+import com.azure.ai.vision.face.samples.utils.Utils;
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.util.BinaryData;
 import reactor.core.publisher.Flux;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
-import static com.azure.ai.vision.face.samples.utils.Utils.log;
 import static com.azure.ai.vision.face.models.FaceAttributeType.Detection01;
 import static com.azure.ai.vision.face.models.FaceAttributeType.Detection03;
 import static com.azure.ai.vision.face.models.FaceAttributeType.Recognition04;
+import static com.azure.ai.vision.face.samples.utils.Utils.log;
 
 public class DetectFacesAsync {
     public static void main(String[] args) {
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java
similarity index 99%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java
index e10e424633d79..dcba044f09ba5 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLiveness.java
@@ -72,8 +72,7 @@ public static void main(String[] args) {
             // We can also list all the liveness sessions of this face account.
             List<LivenessSessionItem> sessions = faceSessionClient.getLivenessSessions();
             logObject("List all the liveness sessions: ", sessions, true);
-        }
-        finally {
+        } finally {
             // Delete this session
             faceSessionClient.deleteLivenessSession(livenessSessionCreationResult.getSessionId());
         }
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessAsync.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessAsync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessAsync.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessAsync.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java
similarity index 98%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java
index 75b48364054d9..10cdb018f470d 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerify.java
@@ -75,7 +75,7 @@ public static void main(String[] args) {
 
         } finally {
 //             Delete this session
-            logObject("Delete liveness sessions: "+sessionId);
+            logObject("Delete liveness sessions: " + sessionId);
             faceSessionClient.deleteLivenessWithVerifySession(sessionId);
         }
     }
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java
similarity index 98%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java
index f4b3d654d2a88..34235078bbff4 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/DetectLivenessWithVerifyAsync.java
@@ -77,7 +77,7 @@ public static void main(String[] args) {
             logObject("List all the liveness sessions: ", sessions, true);
 
         } finally {
-            logObject("Delete liveness sessions: "+sessionId);
+            logObject("Delete liveness sessions: " + sessionId);
             // Delete this session
             faceSessionClient.deleteLivenessWithVerifySession(livenessSessionCreationResult.getSessionId())
                 .block();
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithIds.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithIds.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithIds.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithIds.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithLargeFaceList.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithLargeFaceList.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithLargeFaceList.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/FindSimilarWithLargeFaceList.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/Grouping.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/Grouping.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/Grouping.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/Grouping.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java
similarity index 97%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java
index 60ee33b56e86b..3927ff8532e1e 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyAgainstDynamicPersonDirectory.java
@@ -3,6 +3,8 @@
 
 package com.azure.ai.vision.face.samples;
 
+//import com.azure.ai.vision.face.*;
+
 import com.azure.ai.vision.face.FaceAdministrationClient;
 import com.azure.ai.vision.face.FaceAdministrationClientBuilder;
 import com.azure.ai.vision.face.FaceClient;
@@ -35,7 +37,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.azure.ai.vision.face.samples.utils.Utils.*;
+import static com.azure.ai.vision.face.samples.utils.Utils.log;
+import static com.azure.ai.vision.face.samples.utils.Utils.logObject;
+import static com.azure.ai.vision.face.samples.utils.Utils.safelyRun;
+
 
 public class IdentifyAgainstDynamicPersonDirectory {
     private static final RuntimeException[] EXCEPTION_CONTAINER = new RuntimeException[1];
@@ -200,8 +205,8 @@ private static void listDynamicPersonGroupReferences(
         logObject("List DynamicPersonGroup with " + personData.getName() + " ", dynamicPersonGroupNames);
     }
 
-    private static void deleteDynamicPersonGroups
-        (FaceAdministrationClient administrationClient, List<String> dynamicPersonGroupsIds) {
+    private static void deleteDynamicPersonGroups(
+        FaceAdministrationClient administrationClient, List<String> dynamicPersonGroupsIds) {
 
         log("Deleting DynamicPeronGroups: " + dynamicPersonGroupsIds.size());
         List<SyncPoller<FaceOperationResult, Void>> pollers = dynamicPersonGroupsIds.stream()
@@ -321,7 +326,7 @@ private static String createUserData(String... tags) {
     private static Pair<PersonData, SyncPoller<FaceOperationResult, PersonDirectoryPerson>> createPerson(
         FaceAdministrationClient administrationClient, PersonData personData) {
         log("Create Person: " + personData.getName());
-        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", ()->
+        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", () ->
             Pair.of(personData,
                 administrationClient.beginCreatePerson(personData.getName(), personData.getUserData())));
     }
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyFromLargePersonGroups.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyFromLargePersonGroups.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyFromLargePersonGroups.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyFromLargePersonGroups.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java
similarity index 99%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java
index 8dd6fb022c01f..768d46d1798bf 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/IdentifyPersonAmongPersons.java
@@ -96,7 +96,7 @@ private static void createPersonsAndAddFaces(FaceAdministrationClient administra
 
     private static Pair<PersonData, SyncPoller<FaceOperationResult, PersonDirectoryPerson>> createPerson(
             FaceAdministrationClient administrationClient, PersonData personData) {
-        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", ()->
+        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", () ->
                 Pair.of(personData,
                         administrationClient.beginCreatePerson(personData.getName(), personData.getUserData())));
     }
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/MicrosoftEntraIdAuthentication.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/MicrosoftEntraIdAuthentication.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/MicrosoftEntraIdAuthentication.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/MicrosoftEntraIdAuthentication.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/StatelessVerification.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/StatelessVerification.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/StatelessVerification.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/StatelessVerification.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java
similarity index 97%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java
index 989502bf9f7d3..532e45af75051 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/VerifyFromDynamicPersonDirectory.java
@@ -29,7 +29,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.azure.ai.vision.face.samples.utils.Utils.*;
+import static com.azure.ai.vision.face.samples.utils.Utils.log;
+import static com.azure.ai.vision.face.samples.utils.Utils.safelyRun;
 
 public class VerifyFromDynamicPersonDirectory {
     private static final RuntimeException[] EXCEPTION_CONTAINER = new RuntimeException[1];
@@ -106,7 +107,7 @@ private static void createPersons(FaceAdministrationClient administrationClient,
     private static Pair<PersonData, SyncPoller<FaceOperationResult, PersonDirectoryPerson>> createPerson(
         FaceAdministrationClient administrationClient, PersonData personData) {
         log("Create Person: " + personData.getName());
-        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", ()->
+        return Utils.safelyRunWithExceptionCheck(EXCEPTION_CONTAINER, "createPerson", () ->
             Pair.of(personData,
                 administrationClient.beginCreatePerson(personData.getName(), personData.getUserData())));
     }
@@ -160,7 +161,7 @@ private static SyncPoller<FaceOperationResult, PersonDirectoryFace> addFacesToPe
     private static void deletePersons(FaceAdministrationClient administrationClient, List<PersonData> personDataList) {
         log("Deleting Persons: " + personDataList.size());
         List<SyncPoller<FaceOperationResult, Void>> pollers = personDataList.stream()
-            .map(personData -> Utils.safelyRun(
+            .map(personData -> safelyRun(
                 () -> administrationClient
                     .beginDeletePerson(personData.getPersonId())))
             .filter(Objects::nonNull)
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java
similarity index 94%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java
index fc254a075a84d..39ec8e7d16bdb 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/model/PersonData.java
@@ -5,11 +5,8 @@
 
 import com.azure.ai.vision.face.models.FaceOperationResult;
 import com.azure.ai.vision.face.models.PersonDirectoryFace;
-import com.azure.ai.vision.face.models.PersonDirectoryPerson;
 import com.azure.core.util.polling.SyncPoller;
 
-import java.time.Duration;
-
 public class PersonData {
     private final String name;
     private final String userData;
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ApplicationManager.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ApplicationManager.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ApplicationManager.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ApplicationManager.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ConfigurationHelper.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ConfigurationHelper.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ConfigurationHelper.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/ConfigurationHelper.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Resources.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Resources.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Resources.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Resources.java
diff --git a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java
similarity index 96%
rename from sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java
rename to sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java
index c6d77b68ffd62..87f27973970fc 100644
--- a/sdk/face/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java
+++ b/sdk/vision/azure-ai-vision-face/src/samples/java/com/azure/ai/vision/face/samples/utils/Utils.java
@@ -9,8 +9,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import java.nio.file.Path;
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad2.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad2.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad2.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad2.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad3.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad3.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad3.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Dad3.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter2.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter2.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter2.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter2.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter3.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter3.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter3.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Daughter3.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom2.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom2.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom2.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Mom2.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son2.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son2.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son2.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family1-Son2.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady2.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady2.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady2.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family2-Lady2.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Lady1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Lady1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Lady1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Lady1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Man1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Man1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Man1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/Family3-Man1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/detection1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/detection1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/detection1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/detection1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/detection5.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/detection5.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/detection5.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/detection5.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/findsimilar-sample.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/findsimilar-sample.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/findsimilar-sample.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/findsimilar-sample.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/identification1.jpg b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/identification1.jpg
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/identification1.jpg
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/identification1.jpg
diff --git a/sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/nine-faces.png b/sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/nine-faces.png
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/samples/resources/sample-images/nine-faces.png
rename to sdk/vision/azure-ai-vision-face/src/samples/resources/sample-images/nine-faces.png
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/generated/FaceClientTestBase.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/generated/FaceClientTestBase.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/generated/FaceClientTestBase.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/generated/FaceClientTestBase.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/DetectionTest.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/DetectionTest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/DetectionTest.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/DetectionTest.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/FaceClientTestBase.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/FaceClientTestBase.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/FaceClientTestBase.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/FaceClientTestBase.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionTest.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionTest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionTest.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionTest.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionWithVerifyTest.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionWithVerifyTest.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionWithVerifyTest.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/LivenessSessionWithVerifyTest.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/CommandProvider.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/CommandProvider.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/CommandProvider.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/CommandProvider.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectAsyncFunction.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectAsyncFunction.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectAsyncFunction.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectAsyncFunction.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionAsync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionAsync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionAsync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionAsync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionSync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionSync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionSync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndDetectOptionSync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersAsync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersAsync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersAsync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersAsync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersSync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersSync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersSync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithBinaryAndParametersSync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionAsync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionAsync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionAsync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionAsync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionSync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionSync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionSync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndDetectOptionSync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersAsync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersAsync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersAsync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersAsync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersSync.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersSync.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersSync.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectFunctionWithUrlAndParametersSync.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectSyncFunction.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectSyncFunction.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectSyncFunction.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectSyncFunction.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectionFunctionProvider.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectionFunctionProvider.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectionFunctionProvider.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/detection/DetectionFunctionProvider.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessSessionSyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessSessionSyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessSessionSyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessSessionSyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessWithVerifySessionSyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessWithVerifySessionSyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessWithVerifySessionSyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/ILivenessWithVerifySessionSyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionAsyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionAsyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionAsyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionAsyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionCommandsProvider.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionCommandsProvider.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionCommandsProvider.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionCommandsProvider.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionSyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionSyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionSyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionSyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionWithVerifyCommandsProvider.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionWithVerifyCommandsProvider.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionWithVerifyCommandsProvider.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessSessionWithVerifyCommandsProvider.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionAsyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionAsyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionAsyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionAsyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionSyncCommands.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionSyncCommands.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionSyncCommands.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/commands/liveness/LivenessWithVerifySessionSyncCommands.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/FunctionUtils.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/FunctionUtils.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/FunctionUtils.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/FunctionUtils.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/SevFunction.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/SevFunction.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/SevFunction.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/function/SevFunction.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/FaceDisplayNameGenerator.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/FaceDisplayNameGenerator.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/FaceDisplayNameGenerator.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/FaceDisplayNameGenerator.java
diff --git a/sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/TestUtils.java b/sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/TestUtils.java
similarity index 100%
rename from sdk/face/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/TestUtils.java
rename to sdk/vision/azure-ai-vision-face/src/test/java/com/azure/ai/vision/face/tests/utils/TestUtils.java
diff --git a/sdk/face/azure-ai-vision-face/tsp-location.yaml b/sdk/vision/azure-ai-vision-face/tsp-location.yaml
similarity index 64%
rename from sdk/face/azure-ai-vision-face/tsp-location.yaml
rename to sdk/vision/azure-ai-vision-face/tsp-location.yaml
index 8efd191b4f6e5..9f85aa3454c12 100644
--- a/sdk/face/azure-ai-vision-face/tsp-location.yaml
+++ b/sdk/vision/azure-ai-vision-face/tsp-location.yaml
@@ -1,4 +1,4 @@
 directory: specification/ai/Face
-commit: 2e1a769d48e131213fc240d93b963d1e1099b80f
+commit: 88f9ba778e8611066336aa8713e3205788153913
 repo: Azure/azure-rest-api-specs
 additionalDirectories:
diff --git a/sdk/vision/ci.yml b/sdk/vision/ci.yml
index f0ebe6c50098c..d29337d95a601 100644
--- a/sdk/vision/ci.yml
+++ b/sdk/vision/ci.yml
@@ -10,9 +10,11 @@ trigger:
     include:
       - sdk/vision/ci.yml
       - sdk/vision/azure-ai-vision-imageanalysis/
+      - sdk/vision/azure-ai-vision-face/
     exclude:
       - sdk/vision/pom.xml
       - sdk/vision/azure-ai-vision-imageanalysis/pom.xml
+      - sdk/vision/azure-ai-vision-face/pom.xml
 
 pr:
   branches:
@@ -25,15 +27,21 @@ pr:
     include:
       - sdk/vision/ci.yml
       - sdk/vision/azure-ai-vision-imageanalysis/
+      - sdk/vision/azure-ai-vision-face/
     exclude:
       - sdk/vision/pom.xml
       - sdk/vision/azure-ai-vision-imageanalysis/pom.xml
+      - sdk/vision/azure-ai-vision-face/pom.xml
 
 parameters:
   - name: release_azureaivisionimageanalysis
     displayName: azure-ai-vision-imageanalysis
     type: boolean
     default: true
+  - name: release_azureaivisionface
+    displayName: azure-ai-vision-face
+    type: boolean
+    default: true
 
 # Note that IgnoreVerifyTypeSpecCodeGenerationError is set to true here in order to ignore
 # errors from the task "Verify TypeSpec Code Generation" in the CI pipeline. This task is
@@ -50,4 +58,8 @@ extends:
       - name: azure-ai-vision-imageanalysis
         groupId: com.azure
         safeName: azureaivisionimageanalysis
-        releaseInBatch: ${{ parameters.release_azureaivisionimageanalysis }}
\ No newline at end of file
+        releaseInBatch: ${{ parameters.release_azureaivisionimageanalysis }}
+      - name: azure-ai-vision-face
+        groupId: com.azure
+        safeName: azureaivisionface
+        releaseInBatch: ${{ parameters.release_azureaivisionface }}
diff --git a/sdk/vision/pom.xml b/sdk/vision/pom.xml
index 6ac7de14460e9..971c5fc5464bf 100644
--- a/sdk/vision/pom.xml
+++ b/sdk/vision/pom.xml
@@ -11,5 +11,6 @@
 
   <modules>
     <module>azure-ai-vision-imageanalysis</module>
+    <module>azure-ai-vision-face</module>
   </modules>
-</project>
\ No newline at end of file
+</project>