diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
index 974414af971..fb463ddfc6c 100644
--- a/.github/workflows/api-level-lint.yml
+++ b/.github/workflows/api-level-lint.yml
@@ -17,6 +17,9 @@ jobs:
           distribution: 'temurin'
           java-version: 21
           cache: gradle
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+        shell: pwsh
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3.2.2
       - name: Add execution right to the script
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index b8f28ab3585..d17258cb582 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -22,6 +22,9 @@ jobs:
         run: |
           pip install detect-secrets
           git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+        shell: pwsh
       - name: Grant Execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
@@ -60,6 +63,9 @@ jobs:
           java-version: 8
           distribution: 'temurin'
           cache: gradle
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+        shell: pwsh
       - name: Grant Execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Java 8
diff --git a/.github/workflows/preview-and-release.yml b/.github/workflows/preview-and-release.yml
index b6218f8cc52..352d7cc02c8 100644
--- a/.github/workflows/preview-and-release.yml
+++ b/.github/workflows/preview-and-release.yml
@@ -37,6 +37,9 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           cache: gradle
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+        shell: pwsh
       - name: Detect secrets
         run: |
           pip install detect-secrets
@@ -76,6 +79,9 @@ jobs:
         run: |
           pip install detect-secrets
           git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+        shell: pwsh
       - name: Download File
         run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
         shell: pwsh
@@ -129,6 +135,9 @@ jobs:
         java-version: ${{ env.JAVA_VERSION }}
         distribution: ${{ env.JAVA_DISTRIBUTION}}
         cache: gradle
+    - name: Move generated sources to correct package
+      run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated'
+      shell: pwsh
     - name: Download file
       run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
       shell: pwsh
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index fe523d1d5d2..22fefa7400b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "6.30.0"
+    ".": "6.30.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98b22e7d738..349e938e0a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.30.1](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.30.0...v6.30.1) (2025-02-27)
+
+
+### Bug Fixes
+
+* align build files and javadoc file strcuture ([9eec01c](https://github.com/microsoftgraph/msgraph-sdk-java/commit/9eec01c4cabc7baeeede058d6e7c35c05b93b587))
+* ensure javadocs are generated ([455f669](https://github.com/microsoftgraph/msgraph-sdk-java/commit/455f6698125f692b556369c7d14972ddeeada53e))
+* resolve javadoc and source locations ([a8478a1](https://github.com/microsoftgraph/msgraph-sdk-java/commit/a8478a17744d6c830ae2d9999f4c5e24eeb5be28))
+
 ## [6.30.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.29.0...v6.30.0) (2025-02-25)
 
 
diff --git a/README.md b/README.md
index 30f989ee25a..d86f15e3ef9 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ repositories {
 dependencies {
     // Include the sdk as a dependency
     // x-release-please-start-version
-    implementation 'com.microsoft.graph:microsoft-graph:6.30.0'
+    implementation 'com.microsoft.graph:microsoft-graph:6.30.1'
     // x-release-please-end
     // This dependency is only needed if you are using a TokenCredential object for authentication
     implementation 'com.azure:azure-identity:1.15.0'
@@ -38,7 +38,7 @@ Add the dependency in `dependencies` in pom.xml
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
   <!--x-release-please-start-version-->
-  <version>6.30.0</version>
+  <version>6.30.1</version>
   <!--x-release-please-end-->
 </dependency>
 <dependency>
diff --git a/android/build.gradle b/android/build.gradle
index b4416bb9149..f0392baea30 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.19.2"
         classpath "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.52.0"
-        classpath "com.android.tools.build:gradle:8.8.1"
+        classpath "com.android.tools.build:gradle:8.8.2"
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 314c8ae1518..beb4723ca85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,10 @@ def pomConfig = {
     }
 }
 
-tasks.withType(Javadoc).all { enabled = false }
+tasks.withType(Javadoc).configureEach {
+    enabled = true
+    options.addStringOption('Xdoclint:-missing', '-quiet')
+}
 
 
 tasks.jar {
diff --git a/gradle.properties b/gradle.properties
index 9b837da1f89..11d614dba59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,7 +32,7 @@ mavenMajorVersion = 6
 mavenMinorVersion = 30
 # x-release-please-end
 # x-release-please-start-patch
-mavenPatchVersion = 0
+mavenPatchVersion = 1
 # x-release-please-end
 mavenArtifactSuffix =
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index ef374cc4057..51e41f505ec 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ dependencies {
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 
     // Core Http library
-    api 'com.microsoft.graph:microsoft-graph-core:3.6.0'
+    api 'com.microsoft.graph:microsoft-graph-core:3.6.1'
 
     implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.8.4'
     implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.8.4'
diff --git a/pom.xml b/pom.xml
index 4b3f0530960..5a68f0eac9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph</artifactId>
-    <version>6.30.0</version>
+    <version>6.30.1</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.microsoft.graph</groupId>
             <artifactId>microsoft-graph-core</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/scripts/copyFilesOnBuild.ps1 b/scripts/copyFilesOnBuild.ps1
new file mode 100644
index 00000000000..ab43ce7b5fd
--- /dev/null
+++ b/scripts/copyFilesOnBuild.ps1
@@ -0,0 +1,30 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<# 
+.Synopsis
+    Copy files to a new location that is the parent of the current directory. 
+.Description 
+    Receives an encoded string value and decodes it using base64. 
+    Write the new decoded string to a local file for later consumption. 
+.Parameter inputPath
+    The encoded string we wish to decode.  
+#>
+
+Param(
+    [Parameter(Mandatory = $true)][string]$inputPath 
+)
+
+$fullPath = (Get-Item $inputPath).FullName
+$parentDirectory = (Get-Item $inputPath).Parent
+Push-Location $inputPath
+
+Get-ChildItem '*' -Filter *.java -recurse | ForEach-Object {
+    $TargetDirectory = $_.DirectoryName.Replace($fullPath, "")
+    $TargetPath = Join-Path -Path $parentDirectory -ChildPath $TargetDirectory 
+    If (!(Test-Path $TargetPath)) {
+        New-Item -Path $TargetPath -Type Directory -Force | out-null
+    }
+    $_ | Move-Item -Destination $TargetPath -Force
+}
+Pop-Location
diff --git a/src/main/java/com/microsoft/graph/info/Constants.java b/src/main/java/com/microsoft/graph/info/Constants.java
index bcf6448120f..47b7b6af0d8 100644
--- a/src/main/java/com/microsoft/graph/info/Constants.java
+++ b/src/main/java/com/microsoft/graph/info/Constants.java
@@ -4,7 +4,7 @@
 public final class Constants {
     /** The SDK version */
     // x-release-please-start-version
-    public static final String VERSION_NAME = "6.30.0";
+    public static final String VERSION_NAME = "6.30.1";
     // x-release-please-end
 }