diff --git a/ferrochrome_app/Android.bp b/android/FerrochromeApp/Android.bp
similarity index 100%
rename from ferrochrome_app/Android.bp
rename to android/FerrochromeApp/Android.bp
diff --git a/ferrochrome_app/AndroidManifest.xml b/android/FerrochromeApp/AndroidManifest.xml
similarity index 100%
rename from ferrochrome_app/AndroidManifest.xml
rename to android/FerrochromeApp/AndroidManifest.xml
diff --git a/ferrochrome_app/custom_vm_setup.rc b/android/FerrochromeApp/custom_vm_setup.rc
similarity index 100%
rename from ferrochrome_app/custom_vm_setup.rc
rename to android/FerrochromeApp/custom_vm_setup.rc
diff --git a/ferrochrome_app/custom_vm_setup.sh b/android/FerrochromeApp/custom_vm_setup.sh
similarity index 100%
rename from ferrochrome_app/custom_vm_setup.sh
rename to android/FerrochromeApp/custom_vm_setup.sh
diff --git a/ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java b/android/FerrochromeApp/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
similarity index 100%
rename from ferrochrome_app/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
rename to android/FerrochromeApp/java/com/android/virtualization/ferrochrome/FerrochromeActivity.java
diff --git a/ferrochrome_app/java/com/android/virtualization/ferrochrome/OpenUrlActivity.java b/android/FerrochromeApp/java/com/android/virtualization/ferrochrome/OpenUrlActivity.java
similarity index 100%
rename from ferrochrome_app/java/com/android/virtualization/ferrochrome/OpenUrlActivity.java
rename to android/FerrochromeApp/java/com/android/virtualization/ferrochrome/OpenUrlActivity.java
diff --git a/ferrochrome_app/privapp-permissions-ferrochrome.xml b/android/FerrochromeApp/privapp-permissions-ferrochrome.xml
similarity index 100%
rename from ferrochrome_app/privapp-permissions-ferrochrome.xml
rename to android/FerrochromeApp/privapp-permissions-ferrochrome.xml
diff --git a/ferrochrome_app/repack.sh b/android/FerrochromeApp/repack.sh
similarity index 100%
rename from ferrochrome_app/repack.sh
rename to android/FerrochromeApp/repack.sh
diff --git a/ferrochrome_app/res/layout/activity_ferrochrome.xml b/android/FerrochromeApp/res/layout/activity_ferrochrome.xml
similarity index 100%
rename from ferrochrome_app/res/layout/activity_ferrochrome.xml
rename to android/FerrochromeApp/res/layout/activity_ferrochrome.xml
diff --git a/ferrochrome_app/vm_config.json.template b/android/FerrochromeApp/vm_config.json.template
similarity index 100%
rename from ferrochrome_app/vm_config.json.template
rename to android/FerrochromeApp/vm_config.json.template
diff --git a/vmlauncher_app/Android.bp b/android/VmLauncherApp/Android.bp
similarity index 100%
rename from vmlauncher_app/Android.bp
rename to android/VmLauncherApp/Android.bp
diff --git a/vmlauncher_app/AndroidManifest.xml b/android/VmLauncherApp/AndroidManifest.xml
similarity index 100%
rename from vmlauncher_app/AndroidManifest.xml
rename to android/VmLauncherApp/AndroidManifest.xml
diff --git a/vmlauncher_app/README.md b/android/VmLauncherApp/README.md
similarity index 100%
rename from vmlauncher_app/README.md
rename to android/VmLauncherApp/README.md
diff --git a/vmlauncher_app/java/com/android/virtualization/vmlauncher/MainActivity.java b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java
similarity index 100%
rename from vmlauncher_app/java/com/android/virtualization/vmlauncher/MainActivity.java
rename to android/VmLauncherApp/java/com/android/virtualization/vmlauncher/MainActivity.java
diff --git a/vmlauncher_app/res/layout/activity_main.xml b/android/VmLauncherApp/res/layout/activity_main.xml
similarity index 100%
rename from vmlauncher_app/res/layout/activity_main.xml
rename to android/VmLauncherApp/res/layout/activity_main.xml
diff --git a/vmlauncher_app/res/values/themes.xml b/android/VmLauncherApp/res/values/themes.xml
similarity index 100%
rename from vmlauncher_app/res/values/themes.xml
rename to android/VmLauncherApp/res/values/themes.xml