diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
index 61e0650..fbe82db 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
@@ -19,10 +19,10 @@
to="${escapeXmlAttribute(resOut)}/layout/${layoutName}.xml" />
+ to="${escapeXmlAttribute(srcOut)}/${scrPackage}/${screenClass}.java" />
+ to="${escapeXmlAttribute(srcOut)}/${vmPackage}/${viewModelClass}.java" />
diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
index 56fc6a8..3c298d0 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
@@ -1,7 +1,7 @@
- ${scrPackage}.#if>${screenClass}"
<#if isNewProject>
android:label="@string/app_name"
<#else>
diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
index cb2f541..2e2760f 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${packageName}<#if scrPackage != "">.${scrPackage}#if>;
<#if screenType == "Fragment">
import android.os.Bundle;
diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
index 9911860..2854664 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${packageName}<#if vmPackage != "">.${vmPackage}#if>;
import android.databinding.ObservableField;
import android.view.View;
diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
index d5a311d..d518ef2 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
@@ -7,7 +7,7 @@
+ type="${packageName}.<#if vmPackage != "">${vmPackage}.#if>${viewModelClass}"/>
<#if useStatefulLayout>
+
+
+
+