diff --git a/docs/source-app/workflows/build_lightning_app/from_scratch_content.rst b/docs/source-app/workflows/build_lightning_app/from_scratch_content.rst
index 91e7fea93e28c..d90d8662dd430 100644
--- a/docs/source-app/workflows/build_lightning_app/from_scratch_content.rst
+++ b/docs/source-app/workflows/build_lightning_app/from_scratch_content.rst
@@ -87,10 +87,10 @@ You'll see a print-out like this:
         /Users/Your/Current/dir/your-app-name
 
     run your app with:
-        lightning run app your-app-name/your_app_name/app.py
+        lightning run app your-app-name/app.py
 
     run it on the cloud to share with your collaborators:
-        lightning run app your-app-name/your_app_name/app.py --cloud
+        lightning run app your-app-name/app.py --cloud
 
 ----
 
diff --git a/src/lightning_app/CHANGELOG.md b/src/lightning_app/CHANGELOG.md
index 5a88748832aa3..810cdc51cce5e 100644
--- a/src/lightning_app/CHANGELOG.md
+++ b/src/lightning_app/CHANGELOG.md
@@ -48,6 +48,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Resolved a bug where the install command was not installing the latest version of an app/component by default ([#14181](https://github.com/Lightning-AI/lightning/pull/14181))
 
 
+- Unification of app template: moved `app.py` to root dir for `lightning init app <app_name>` template ([#13853](https://github.com/Lightning-AI/lightning/pull/13853))
+
+
 ## [0.5.5] - 2022-08-9
 
 ### Deprecated
diff --git a/src/lightning_app/cli/app-template/placeholdername/app.py b/src/lightning_app/cli/app-template/app.py
similarity index 100%
rename from src/lightning_app/cli/app-template/placeholdername/app.py
rename to src/lightning_app/cli/app-template/app.py
diff --git a/src/lightning_app/cli/cmd_init.py b/src/lightning_app/cli/cmd_init.py
index 4e239da87c736..565cbd0dec03f 100644
--- a/src/lightning_app/cli/cmd_init.py
+++ b/src/lightning_app/cli/cmd_init.py
@@ -19,10 +19,10 @@ def app(app_name):
     {new_resource_name}
 
     run your app with:
-        lightning run app {app_name}/{name_for_files}/app.py
+        lightning run app {app_name}/app.py
 
     run it on the cloud to share with your collaborators:
-        lightning run app {app_name}/{name_for_files}/app.py --cloud
+        lightning run app {app_name}/app.py --cloud
     """
     logger.info(m)