diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a721e95f..cd63352c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,13 +44,10 @@ jobs:
 
     - name: Build and check
       run: |
-        cd ApiDemos
-        for dir in ./*/ ; do 
-          if [[ "$dir" != "./resources/" ]]; then 
-            ( cd "$dir" && ./gradlew buildDebugPreBundle ) 
-          fi 
-        done
-        
+        cd ApiDemos/project
+        ./gradlew :java-app:buildDebugPreBundle
+        ./gradlew :kotlin-app:buildDebugPreBundle
+
   build-WearOS:
     runs-on: ubuntu-latest
     timeout-minutes: 45
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2580b32be..92435cc7d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,15 +34,14 @@ jobs:
 
     - name: Build APKs
       run: |
-        echo "Generating ApiDemos (Java) APKs"
-        cd $GITHUB_WORKSPACE/ApiDemos/java
-        ./gradlew assemble
-        cp ./app/build/outputs/apk/debug/app-debug.apk $GITHUB_WORKSPACE/ApiDemos-java-debug.apk
-
-        echo "Generating Kotlin (Kotlin) APKs"
-        cd $GITHUB_WORKSPACE/ApiDemos/kotlin
-        ./gradlew assemble
-        cp ./app/build/outputs/apk/debug/app-debug.apk $GITHUB_WORKSPACE/ApiDemos-kotlin-debug.apk
+        echo "Generating ApiDemos (Java) APK"
+        cd $GITHUB_WORKSPACE/ApiDemos/project
+        ./gradlew :java-app:assembleDebug
+        cp java-app/build/outputs/apk/debug/java-app-debug.apk $GITHUB_WORKSPACE/ApiDemos-java-debug.apk
+  
+        echo "Generating ApiDemos (Kotlin) APK"
+        ./gradlew :kotlin-app:assembleDebug
+        cp kotlin-app/build/outputs/apk/debug/kotlin-app-debug.apk $GITHUB_WORKSPACE/ApiDemos-kotlin-debug.apk
 
     - uses: actions/setup-node@v2
       with:
diff --git a/.releaserc b/.releaserc
index 27f40405e..e0b93f731 100644
--- a/.releaserc
+++ b/.releaserc
@@ -6,14 +6,14 @@ plugins:
   - - "@google/semantic-release-replace-plugin"
     - replacements:
         - files:
-            - "./ApiDemos/java/app/build.gradle.kts"
-            - "./ApiDemos/kotlin/app/build.gradle.kts"
+            - "./ApiDemos/project/java-app/build.gradle.kts"
+            - "./ApiDemos/project/kotlin-app/build.gradle.kts"
           from: "versionName = \".*\""
           to: "versionName = \"${nextRelease.version}\""
   - - "@semantic-release/git"
     - assets:
-        - "./ApiDemos/java/app/build.gradle.kts"
-        - "./ApiDemos/kotlin/app/build.gradle.kts"
+        - "./ApiDemos/project/java-app/build.gradle.kts"
+        - "./ApiDemos/project/kotlin-app/build.gradle.kts"
   - - "@semantic-release/github"
     - assets:
         - "./ApiDemos-java-debug.apk"