diff --git a/apps/wyatt_app_template/wyatt_app_template/.env.example b/apps/wyatt_app_template/.env.example
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/.env.example
rename to apps/wyatt_app_template/.env.example
diff --git a/apps/wyatt_app_template/wyatt_app_template/.gitignore b/apps/wyatt_app_template/.gitignore
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/.gitignore
rename to apps/wyatt_app_template/.gitignore
diff --git a/apps/wyatt_app_template/wyatt_app_template/.metadata b/apps/wyatt_app_template/.metadata
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/.metadata
rename to apps/wyatt_app_template/.metadata
diff --git a/apps/wyatt_app_template/wyatt_app_template/.vscode/launch.json b/apps/wyatt_app_template/.vscode/launch.json
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/.vscode/launch.json
rename to apps/wyatt_app_template/.vscode/launch.json
diff --git a/apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json b/apps/wyatt_app_template/.vscode/settings.json
similarity index 84%
rename from apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json
rename to apps/wyatt_app_template/.vscode/settings.json
index 69ad607..364ffbc 100644
--- a/apps/wyatt_app_template/wyatt_app_template/.vscode/settings.json
+++ b/apps/wyatt_app_template/.vscode/settings.json
@@ -8,7 +8,7 @@
         {
           "language": "*",
           "template": [
-            "Wyatt App Copyright (c) <<year>>"
+            "Display Name Copyright (c) <<year>>"
           ]
         }
       ],
diff --git a/apps/wyatt_app_template/wyatt_app_template/README.md b/apps/wyatt_app_template/README.md
similarity index 99%
rename from apps/wyatt_app_template/wyatt_app_template/README.md
rename to apps/wyatt_app_template/README.md
index 1545a0b..7193ad0 100644
--- a/apps/wyatt_app_template/wyatt_app_template/README.md
+++ b/apps/wyatt_app_template/README.md
@@ -1,4 +1,4 @@
-# Wyatt App
+# Display Name
 
 wyatt_description
 
diff --git a/apps/wyatt_app_template/wyatt_app_template/Taskfile.yml b/apps/wyatt_app_template/Taskfile.yml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/Taskfile.yml
rename to apps/wyatt_app_template/Taskfile.yml
diff --git a/apps/wyatt_app_template/wyatt_app_template/analysis_options.yaml b/apps/wyatt_app_template/analysis_options.yaml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/analysis_options.yaml
rename to apps/wyatt_app_template/analysis_options.yaml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/.gitignore b/apps/wyatt_app_template/android/.gitignore
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/.gitignore
rename to apps/wyatt_app_template/android/.gitignore
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/build.gradle b/apps/wyatt_app_template/android/app/build.gradle
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/build.gradle
rename to apps/wyatt_app_template/android/app/build.gradle
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/debug/AndroidManifest.xml b/apps/wyatt_app_template/android/app/src/debug/AndroidManifest.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/debug/AndroidManifest.xml
rename to apps/wyatt_app_template/android/app/src/debug/AndroidManifest.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/AndroidManifest.xml b/apps/wyatt_app_template/android/app/src/main/AndroidManifest.xml
similarity index 97%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/AndroidManifest.xml
rename to apps/wyatt_app_template/android/app/src/main/AndroidManifest.xml
index 8664a53..d2c6102 100644
--- a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/AndroidManifest.xml
+++ b/apps/wyatt_app_template/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.wyattapp.new.wyatt_app_template">
    <application
-        android:label="Wyatt App"
+        android:label="Display Name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/kotlin/io/wyattapp/new/wyatt_app_template/MainActivity.kt b/apps/wyatt_app_template/android/app/src/main/kotlin/io/wyattapp/new/wyatt_app_template/MainActivity.kt
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/kotlin/io/wyattapp/new/wyatt_app_template/MainActivity.kt
rename to apps/wyatt_app_template/android/app/src/main/kotlin/io/wyattapp/new/wyatt_app_template/MainActivity.kt
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/drawable-v21/launch_background.xml b/apps/wyatt_app_template/android/app/src/main/res/drawable-v21/launch_background.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/drawable-v21/launch_background.xml
rename to apps/wyatt_app_template/android/app/src/main/res/drawable-v21/launch_background.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/drawable/launch_background.xml b/apps/wyatt_app_template/android/app/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/drawable/launch_background.xml
rename to apps/wyatt_app_template/android/app/src/main/res/drawable/launch_background.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/wyatt_app_template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to apps/wyatt_app_template/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/wyatt_app_template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to apps/wyatt_app_template/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/wyatt_app_template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to apps/wyatt_app_template/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/wyatt_app_template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to apps/wyatt_app_template/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/wyatt_app_template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to apps/wyatt_app_template/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/values-night/styles.xml b/apps/wyatt_app_template/android/app/src/main/res/values-night/styles.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/values-night/styles.xml
rename to apps/wyatt_app_template/android/app/src/main/res/values-night/styles.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/values/styles.xml b/apps/wyatt_app_template/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/main/res/values/styles.xml
rename to apps/wyatt_app_template/android/app/src/main/res/values/styles.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/app/src/profile/AndroidManifest.xml b/apps/wyatt_app_template/android/app/src/profile/AndroidManifest.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/app/src/profile/AndroidManifest.xml
rename to apps/wyatt_app_template/android/app/src/profile/AndroidManifest.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/build.gradle b/apps/wyatt_app_template/android/build.gradle
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/build.gradle
rename to apps/wyatt_app_template/android/build.gradle
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/gradle.properties b/apps/wyatt_app_template/android/gradle.properties
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/gradle.properties
rename to apps/wyatt_app_template/android/gradle.properties
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/gradle/wrapper/gradle-wrapper.properties b/apps/wyatt_app_template/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/gradle/wrapper/gradle-wrapper.properties
rename to apps/wyatt_app_template/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/apps/wyatt_app_template/wyatt_app_template/android/settings.gradle b/apps/wyatt_app_template/android/settings.gradle
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/android/settings.gradle
rename to apps/wyatt_app_template/android/settings.gradle
diff --git a/apps/wyatt_app_template/wyatt_app_template/assets/colors.xml b/apps/wyatt_app_template/assets/colors.xml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/assets/colors.xml
rename to apps/wyatt_app_template/assets/colors.xml
diff --git a/apps/wyatt_app_template/wyatt_app_template/assets/fonts/.gitkeep b/apps/wyatt_app_template/assets/fonts/.gitkeep
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/assets/fonts/.gitkeep
rename to apps/wyatt_app_template/assets/fonts/.gitkeep
diff --git a/apps/wyatt_app_template/wyatt_app_template/assets/images/wyatt_logo.jpeg b/apps/wyatt_app_template/assets/images/wyatt_logo.jpeg
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/assets/images/wyatt_logo.jpeg
rename to apps/wyatt_app_template/assets/images/wyatt_logo.jpeg
diff --git a/apps/wyatt_app_template/wyatt_app_template/assets/l10n/intl_fr.arb b/apps/wyatt_app_template/assets/l10n/intl_fr.arb
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/assets/l10n/intl_fr.arb
rename to apps/wyatt_app_template/assets/l10n/intl_fr.arb
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/build.yml b/apps/wyatt_app_template/automation/build.yml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/automation/build.yml
rename to apps/wyatt_app_template/automation/build.yml
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/generator.yml b/apps/wyatt_app_template/automation/generator.yml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/automation/generator.yml
rename to apps/wyatt_app_template/automation/generator.yml
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/pub.yml b/apps/wyatt_app_template/automation/pub.yml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/automation/pub.yml
rename to apps/wyatt_app_template/automation/pub.yml
diff --git a/apps/wyatt_app_template/wyatt_app_template/automation/run.yml b/apps/wyatt_app_template/automation/run.yml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/automation/run.yml
rename to apps/wyatt_app_template/automation/run.yml
diff --git a/apps/wyatt_app_template/brick_config.yaml b/apps/wyatt_app_template/brick_config.yaml
index 840bb2a..e1b7adf 100644
--- a/apps/wyatt_app_template/brick_config.yaml
+++ b/apps/wyatt_app_template/brick_config.yaml
@@ -1,15 +1,23 @@
-name: wyatt_app_template
+name: wyatt_app
 description: New app template for Wyatt Studio projects.
-path_to_brickify: wyatt_app_template
+
+path_to_brickify: .
+brick_ignore:
+  - .env
+  - brick_config.yaml 
+  - .dart_tool/
+  - .idea/
+  - build/
+  - node_modules/
 
 version: 0.1.0
 
 vars:
   display_name:
-    name: Wyatt App
+    name: Display Name
     type: string
     description: The display name
-    default: Wyatt App
+    default: Display Name
     prompt: "What is the display name?"
 
   project_name:
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/.gitignore b/apps/wyatt_app_template/ios/.gitignore
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/.gitignore
rename to apps/wyatt_app_template/ios/.gitignore
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Flutter/AppFrameworkInfo.plist b/apps/wyatt_app_template/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Flutter/AppFrameworkInfo.plist
rename to apps/wyatt_app_template/ios/Flutter/AppFrameworkInfo.plist
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Flutter/Debug.xcconfig b/apps/wyatt_app_template/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Flutter/Debug.xcconfig
rename to apps/wyatt_app_template/ios/Flutter/Debug.xcconfig
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Flutter/Release.xcconfig b/apps/wyatt_app_template/ios/Flutter/Release.xcconfig
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Flutter/Release.xcconfig
rename to apps/wyatt_app_template/ios/Flutter/Release.xcconfig
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Podfile b/apps/wyatt_app_template/ios/Podfile
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Podfile
rename to apps/wyatt_app_template/ios/Podfile
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Podfile.lock b/apps/wyatt_app_template/ios/Podfile.lock
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Podfile.lock
rename to apps/wyatt_app_template/ios/Podfile.lock
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.pbxproj b/apps/wyatt_app_template/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.pbxproj
rename to apps/wyatt_app_template/ios/Runner.xcodeproj/project.pbxproj
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to apps/wyatt_app_template/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/apps/wyatt_app_template/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to apps/wyatt_app_template/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/contents.xcworkspacedata b/apps/wyatt_app_template/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to apps/wyatt_app_template/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to apps/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/apps/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to apps/wyatt_app_template/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/AppDelegate.swift b/apps/wyatt_app_template/ios/Runner/AppDelegate.swift
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/AppDelegate.swift
rename to apps/wyatt_app_template/ios/Runner/AppDelegate.swift
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
rename to apps/wyatt_app_template/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Base.lproj/LaunchScreen.storyboard b/apps/wyatt_app_template/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to apps/wyatt_app_template/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Base.lproj/Main.storyboard b/apps/wyatt_app_template/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Base.lproj/Main.storyboard
rename to apps/wyatt_app_template/ios/Runner/Base.lproj/Main.storyboard
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Info.plist b/apps/wyatt_app_template/ios/Runner/Info.plist
similarity index 96%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Info.plist
rename to apps/wyatt_app_template/ios/Runner/Info.plist
index eb96919..0dbab55 100644
--- a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Info.plist
+++ b/apps/wyatt_app_template/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Wyatt App</string>
+	<string>Display Name</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Wyatt App</string>
+	<string>Display Name</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/apps/wyatt_app_template/wyatt_app_template/ios/Runner/Runner-Bridging-Header.h b/apps/wyatt_app_template/ios/Runner/Runner-Bridging-Header.h
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/ios/Runner/Runner-Bridging-Header.h
rename to apps/wyatt_app_template/ios/Runner/Runner-Bridging-Header.h
diff --git a/apps/wyatt_app_template/wyatt_app_template/l10n.yaml b/apps/wyatt_app_template/l10n.yaml
similarity index 68%
rename from apps/wyatt_app_template/wyatt_app_template/l10n.yaml
rename to apps/wyatt_app_template/l10n.yaml
index 7a66bf4..aeed2b1 100644
--- a/apps/wyatt_app_template/wyatt_app_template/l10n.yaml
+++ b/apps/wyatt_app_template/l10n.yaml
@@ -5,4 +5,4 @@ output-dir: lib/gen/
 nullable-getter: false
 use-deferred-loading: true
 synthetic-package: false
-header: "/// Wyatt App, localized files. Automatically generated with `task gen:intl`."
\ No newline at end of file
+header: "/// Display Name, localized files. Automatically generated with `task gen:intl`."
\ No newline at end of file
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/bootstrap.dart b/apps/wyatt_app_template/lib/bootstrap.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/bootstrap.dart
rename to apps/wyatt_app_template/lib/bootstrap.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/constants/emulator.dart b/apps/wyatt_app_template/lib/core/constants/emulator.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/constants/emulator.dart
rename to apps/wyatt_app_template/lib/core/constants/emulator.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/dependency_injection/get_it.dart b/apps/wyatt_app_template/lib/core/dependency_injection/get_it.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/dependency_injection/get_it.dart
rename to apps/wyatt_app_template/lib/core/dependency_injection/get_it.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/enums/dev_mode.dart b/apps/wyatt_app_template/lib/core/enums/dev_mode.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/enums/dev_mode.dart
rename to apps/wyatt_app_template/lib/core/enums/dev_mode.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/extensions/build_context_extension.dart b/apps/wyatt_app_template/lib/core/extensions/build_context_extension.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/extensions/build_context_extension.dart
rename to apps/wyatt_app_template/lib/core/extensions/build_context_extension.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/flavors/flavor.dart b/apps/wyatt_app_template/lib/core/flavors/flavor.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/flavors/flavor.dart
rename to apps/wyatt_app_template/lib/core/flavors/flavor.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/routes/router.dart b/apps/wyatt_app_template/lib/core/routes/router.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/routes/router.dart
rename to apps/wyatt_app_template/lib/core/routes/router.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/core/utils/app_bloc_observer.dart b/apps/wyatt_app_template/lib/core/utils/app_bloc_observer.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/core/utils/app_bloc_observer.dart
rename to apps/wyatt_app_template/lib/core/utils/app_bloc_observer.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/data_sources/local/counter_data_source_impl.dart b/apps/wyatt_app_template/lib/data/data_sources/local/counter_data_source_impl.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/data_sources/local/counter_data_source_impl.dart
rename to apps/wyatt_app_template/lib/data/data_sources/local/counter_data_source_impl.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/data_sources/remote/.gitkeep b/apps/wyatt_app_template/lib/data/data_sources/remote/.gitkeep
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/data_sources/remote/.gitkeep
rename to apps/wyatt_app_template/lib/data/data_sources/remote/.gitkeep
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.dart b/apps/wyatt_app_template/lib/data/models/integer_model.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.dart
rename to apps/wyatt_app_template/lib/data/models/integer_model.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.freezed.dart b/apps/wyatt_app_template/lib/data/models/integer_model.freezed.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.freezed.dart
rename to apps/wyatt_app_template/lib/data/models/integer_model.freezed.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.g.dart b/apps/wyatt_app_template/lib/data/models/integer_model.g.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/models/integer_model.g.dart
rename to apps/wyatt_app_template/lib/data/models/integer_model.g.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/data/repositories/counter_repository_impl.dart b/apps/wyatt_app_template/lib/data/repositories/counter_repository_impl.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/data/repositories/counter_repository_impl.dart
rename to apps/wyatt_app_template/lib/data/repositories/counter_repository_impl.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/data_sources/local/counter_data_source.dart b/apps/wyatt_app_template/lib/domain/data_sources/local/counter_data_source.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/data_sources/local/counter_data_source.dart
rename to apps/wyatt_app_template/lib/domain/data_sources/local/counter_data_source.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/data_sources/remote/.gitkeep b/apps/wyatt_app_template/lib/domain/data_sources/remote/.gitkeep
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/data_sources/remote/.gitkeep
rename to apps/wyatt_app_template/lib/domain/data_sources/remote/.gitkeep
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/entities/integer.dart b/apps/wyatt_app_template/lib/domain/entities/integer.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/entities/integer.dart
rename to apps/wyatt_app_template/lib/domain/entities/integer.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/repositories/counter_repository.dart b/apps/wyatt_app_template/lib/domain/repositories/counter_repository.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/repositories/counter_repository.dart
rename to apps/wyatt_app_template/lib/domain/repositories/counter_repository.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/decrement.dart b/apps/wyatt_app_template/lib/domain/usecases/counter/decrement.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/decrement.dart
rename to apps/wyatt_app_template/lib/domain/usecases/counter/decrement.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/get_current.dart b/apps/wyatt_app_template/lib/domain/usecases/counter/get_current.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/get_current.dart
rename to apps/wyatt_app_template/lib/domain/usecases/counter/get_current.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/increment.dart b/apps/wyatt_app_template/lib/domain/usecases/counter/increment.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/increment.dart
rename to apps/wyatt_app_template/lib/domain/usecases/counter/increment.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/reset.dart b/apps/wyatt_app_template/lib/domain/usecases/counter/reset.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/domain/usecases/counter/reset.dart
rename to apps/wyatt_app_template/lib/domain/usecases/counter/reset.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations.dart b/apps/wyatt_app_template/lib/gen/app_localizations.dart
similarity index 98%
rename from apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations.dart
rename to apps/wyatt_app_template/lib/gen/app_localizations.dart
index f9e3bc6..6081a53 100644
--- a/apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations.dart
+++ b/apps/wyatt_app_template/lib/gen/app_localizations.dart
@@ -1,4 +1,4 @@
-/// Wyatt App, localized files. Automatically generated with `task gen:intl`.
+/// Display Name, localized files. Automatically generated with `task gen:intl`.
 import 'dart:async';
 
 import 'package:flutter/widgets.dart';
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations_fr.dart b/apps/wyatt_app_template/lib/gen/app_localizations_fr.dart
similarity index 84%
rename from apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations_fr.dart
rename to apps/wyatt_app_template/lib/gen/app_localizations_fr.dart
index 1029aee..e5fa2e5 100644
--- a/apps/wyatt_app_template/wyatt_app_template/lib/gen/app_localizations_fr.dart
+++ b/apps/wyatt_app_template/lib/gen/app_localizations_fr.dart
@@ -1,4 +1,4 @@
-/// Wyatt App, localized files. Automatically generated with `task gen:intl`.
+/// Display Name, localized files. Automatically generated with `task gen:intl`.
 
 import 'app_localizations.dart';
 
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/gen/assets.gen.dart b/apps/wyatt_app_template/lib/gen/assets.gen.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/gen/assets.gen.dart
rename to apps/wyatt_app_template/lib/gen/assets.gen.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/gen/colors.gen.dart b/apps/wyatt_app_template/lib/gen/colors.gen.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/gen/colors.gen.dart
rename to apps/wyatt_app_template/lib/gen/colors.gen.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/main.dart b/apps/wyatt_app_template/lib/main.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/main.dart
rename to apps/wyatt_app_template/lib/main.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/main_development.dart b/apps/wyatt_app_template/lib/main_development.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/main_development.dart
rename to apps/wyatt_app_template/lib/main_development.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/main_production.dart b/apps/wyatt_app_template/lib/main_production.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/main_production.dart
rename to apps/wyatt_app_template/lib/main_production.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/main_staging.dart b/apps/wyatt_app_template/lib/main_staging.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/main_staging.dart
rename to apps/wyatt_app_template/lib/main_staging.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/app/app.dart b/apps/wyatt_app_template/lib/presentation/features/app/app.dart
similarity index 98%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/app/app.dart
rename to apps/wyatt_app_template/lib/presentation/features/app/app.dart
index 7825f54..cd38723 100644
--- a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/app/app.dart
+++ b/apps/wyatt_app_template/lib/presentation/features/app/app.dart
@@ -45,7 +45,7 @@ class App extends StatelessWidget {
       ],
       child: _flavorBanner(
         MaterialApp.router(
-          title: 'Wyatt App',
+          title: 'Display Name',
           debugShowCheckedModeBanner: false,
           routerDelegate: AppRouter.router.routerDelegate,
           routeInformationParser: AppRouter.router.routeInformationParser,
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_bloc.dart b/apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_bloc.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_bloc.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_bloc.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_event.dart b/apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_event.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_event.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_event.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_state.dart b/apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_state.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_state.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_bloc/counter_state.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_cubit.dart b/apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_cubit.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_cubit.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_cubit.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_state.dart b/apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_state.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_state.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/blocs/counter_cubit/counter_state.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/counter.dart b/apps/wyatt_app_template/lib/presentation/features/counter/counter.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/counter.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/counter.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/screens/counter_provider.dart b/apps/wyatt_app_template/lib/presentation/features/counter/screens/counter_provider.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/screens/counter_provider.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/screens/counter_provider.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/screens/widgets/counter_consumer_widget.dart b/apps/wyatt_app_template/lib/presentation/features/counter/screens/widgets/counter_consumer_widget.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/screens/widgets/counter_consumer_widget.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/screens/widgets/counter_consumer_widget.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/stateless/counter_widget.dart b/apps/wyatt_app_template/lib/presentation/features/counter/stateless/counter_widget.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/counter/stateless/counter_widget.dart
rename to apps/wyatt_app_template/lib/presentation/features/counter/stateless/counter_widget.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/home/home.dart b/apps/wyatt_app_template/lib/presentation/features/home/home.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/features/home/home.dart
rename to apps/wyatt_app_template/lib/presentation/features/home/home.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/shared/layouts/wyatt_app_template_scaffold.dart b/apps/wyatt_app_template/lib/presentation/shared/layouts/wyatt_app_template_scaffold.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/shared/layouts/wyatt_app_template_scaffold.dart
rename to apps/wyatt_app_template/lib/presentation/shared/layouts/wyatt_app_template_scaffold.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/lib/presentation/shared/widgets/.gitkeep b/apps/wyatt_app_template/lib/presentation/shared/widgets/.gitkeep
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/lib/presentation/shared/widgets/.gitkeep
rename to apps/wyatt_app_template/lib/presentation/shared/widgets/.gitkeep
diff --git a/apps/wyatt_app_template/wyatt_app_template/local_packages/README.md b/apps/wyatt_app_template/local_packages/README.md
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/local_packages/README.md
rename to apps/wyatt_app_template/local_packages/README.md
diff --git a/apps/wyatt_app_template/wyatt_app_template/package-lock.json b/apps/wyatt_app_template/package-lock.json
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/package-lock.json
rename to apps/wyatt_app_template/package-lock.json
diff --git a/apps/wyatt_app_template/wyatt_app_template/package.json b/apps/wyatt_app_template/package.json
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/package.json
rename to apps/wyatt_app_template/package.json
diff --git a/apps/wyatt_app_template/wyatt_app_template/pubspec.yaml b/apps/wyatt_app_template/pubspec.yaml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/pubspec.yaml
rename to apps/wyatt_app_template/pubspec.yaml
diff --git a/apps/wyatt_app_template/wyatt_app_template/pubspec_overrides.yaml b/apps/wyatt_app_template/pubspec_overrides.yaml
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/pubspec_overrides.yaml
rename to apps/wyatt_app_template/pubspec_overrides.yaml
diff --git a/apps/wyatt_app_template/wyatt_app_template/test/widget_test.dart b/apps/wyatt_app_template/test/widget_test.dart
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/test/widget_test.dart
rename to apps/wyatt_app_template/test/widget_test.dart
diff --git a/apps/wyatt_app_template/wyatt_app_template/trapeze.yaml b/apps/wyatt_app_template/trapeze.yaml
similarity index 97%
rename from apps/wyatt_app_template/wyatt_app_template/trapeze.yaml
rename to apps/wyatt_app_template/trapeze.yaml
index f892e25..afcdf8e 100644
--- a/apps/wyatt_app_template/wyatt_app_template/trapeze.yaml
+++ b/apps/wyatt_app_template/trapeze.yaml
@@ -4,7 +4,7 @@ vars:
   BUNDLE_ID:
     default: io.wyattapp.new
   APP_NAME:
-    default: Wyatt App
+    default: Display Name
 
 platforms:
   android:
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/favicon.png b/apps/wyatt_app_template/web/favicon.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/web/favicon.png
rename to apps/wyatt_app_template/web/favicon.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-192.png b/apps/wyatt_app_template/web/icons/Icon-192.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-192.png
rename to apps/wyatt_app_template/web/icons/Icon-192.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-512.png b/apps/wyatt_app_template/web/icons/Icon-512.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-512.png
rename to apps/wyatt_app_template/web/icons/Icon-512.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-maskable-192.png b/apps/wyatt_app_template/web/icons/Icon-maskable-192.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-maskable-192.png
rename to apps/wyatt_app_template/web/icons/Icon-maskable-192.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-maskable-512.png b/apps/wyatt_app_template/web/icons/Icon-maskable-512.png
similarity index 100%
rename from apps/wyatt_app_template/wyatt_app_template/web/icons/Icon-maskable-512.png
rename to apps/wyatt_app_template/web/icons/Icon-maskable-512.png
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/index.html b/apps/wyatt_app_template/web/index.html
similarity index 94%
rename from apps/wyatt_app_template/wyatt_app_template/web/index.html
rename to apps/wyatt_app_template/web/index.html
index 368f7bb..1b5feef 100644
--- a/apps/wyatt_app_template/wyatt_app_template/web/index.html
+++ b/apps/wyatt_app_template/web/index.html
@@ -23,13 +23,13 @@
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="Wyatt App">
+  <meta name="apple-mobile-web-app-title" content="Display Name">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png"/>
 
-  <title>Wyatt App</title>
+  <title>Display Name</title>
   <link rel="manifest" href="manifest.json">
 
   <script>
diff --git a/apps/wyatt_app_template/wyatt_app_template/web/manifest.json b/apps/wyatt_app_template/web/manifest.json
similarity index 93%
rename from apps/wyatt_app_template/wyatt_app_template/web/manifest.json
rename to apps/wyatt_app_template/web/manifest.json
index 88f778d..85c6dde 100644
--- a/apps/wyatt_app_template/wyatt_app_template/web/manifest.json
+++ b/apps/wyatt_app_template/web/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name": "Wyatt App",
-    "short_name": "Wyatt App",
+    "name": "Display Name",
+    "short_name": "Display Name",
     "start_url": ".",
     "display": "standalone",
     "background_color": "#0175C2",
diff --git a/apps/wyatt_feature_brick/lib/feature_name/screens/widgets/feature_name_consumer_widget.dart b/apps/wyatt_feature_brick/lib/feature_name/screens/widgets/feature_name_consumer_widget.dart
index 49d40ef..d207eb7 100644
--- a/apps/wyatt_feature_brick/lib/feature_name/screens/widgets/feature_name_consumer_widget.dart
+++ b/apps/wyatt_feature_brick/lib/feature_name/screens/widgets/feature_name_consumer_widget.dart
@@ -10,7 +10,7 @@ import '../../blocs/feature_name_cubit/feature_name_cubit.dart';
 /// {@endtemplate}
 class FeatureNameConsumerWidget
     extends CubitConsumerScreen<FeatureNameCubit, FeatureNameState> {
-  /// {@macro feature_name_sf_widget}
+  /// {@macro feature_name_consumer_widget}
   const FeatureNameConsumerWidget({super.key});
 
   @override
diff --git a/mason-lock.json b/mason-lock.json
index 938c454..a1b2b29 100644
--- a/mason-lock.json
+++ b/mason-lock.json
@@ -1 +1 @@
-{"bricks":{"core_app_brick":{"path":"bricks/core_app_brick"},"wyatt_package":{"path":"bricks/wyatt_package"},"wyatt_clean_code":{"path":"bricks/wyatt_clean_code"}}}
\ No newline at end of file
+{"bricks":{"core_app_brick":{"path":"bricks/core_app_brick"},"wyatt_package":{"path":"bricks/wyatt_package"},"wyatt_clean_code":{"path":"bricks/wyatt_clean_code"},"wyatt_feature_brick":{"path":"../../../bricks/wyatt_feature_brick/"}}}
\ No newline at end of file
diff --git a/tools/brick_generator/bin/brick_generator.dart b/tools/brick_generator/bin/brick_generator.dart
index a96c5ef..eccf02e 100644
--- a/tools/brick_generator/bin/brick_generator.dart
+++ b/tools/brick_generator/bin/brick_generator.dart
@@ -65,6 +65,10 @@ Future<void> main(List<String> arguments) async {
     await Shell.cp(sourcePath, targetPath);
     Logger.info('Files copied.');
 
+    // Remove ignored folders
+    final brickPath = path.join(targetPath, brickConfig.pathToBrickify);
+    await FileSystemUtils.deleteIgnoredFolders(brickConfig, brickPath);
+
     // Convert values to variables
     await FileSystemUtils.convertValuesToVariablesInFolder(
       brickConfig,
diff --git a/tools/brick_generator/lib/file_system_utils.dart b/tools/brick_generator/lib/file_system_utils.dart
index 749af84..94bead9 100644
--- a/tools/brick_generator/lib/file_system_utils.dart
+++ b/tools/brick_generator/lib/file_system_utils.dart
@@ -20,6 +20,8 @@ import 'package:brick_generator/logger.dart';
 import 'package:brick_generator/models/brick_config.dart';
 import 'package:brick_generator/models/variable_string_syntax.dart';
 import 'package:brick_generator/models/variable_type.dart';
+import 'package:brick_generator/shell.dart';
+import 'package:path/path.dart';
 
 class FileSystemUtils {
   static Future<void> convertValuesToVariablesInFolder(
@@ -30,34 +32,38 @@ class FileSystemUtils {
       Directory(path)
           .listSync(recursive: true)
           .whereType<File>()
-          .map((_) async {
-        var file = _;
+          .map((f) async {
+        var file = f;
 
-        var contents = await file.readAsString();
+        try {
+          var contents = await file.readAsString();
 
-        // Transform all values in variables
-        if (brickConfig.variables != null) {
-          for (final variable in brickConfig.variables!) {
-            // Replace all string variables
-            if (variable?.type == VariableType.string) {
-              for (final syntax in VariableStringSyntax.values) {
-                final toReplace = variable?.syntax?[syntax.mapKey];
-                if (toReplace != null) {
-                  contents = contents.replaceAll(
-                    toReplace,
-                    '{{#${syntax.id}}}{{${variable?.name}}}{{/${syntax.id}}}',
-                  );
+          // Transform all values in variables
+          if (brickConfig.variables != null) {
+            for (final variable in brickConfig.variables!) {
+              // Replace all string variables
+              if (variable?.type == VariableType.string) {
+                for (final syntax in VariableStringSyntax.values) {
+                  final toReplace = variable?.syntax?[syntax.mapKey];
+                  if (toReplace != null) {
+                    contents = contents.replaceAll(
+                      toReplace,
+                      '{{#${syntax.id}}}{{${variable?.name}}}{{/${syntax.id}}}',
+                    );
+                  }
                 }
               }
+              Logger.debug(
+                'Variable `${variable?.name}` replaced in ${file.path}',
+              );
             }
-            Logger.debug(
-              'Variable `${variable?.name}` replaced in ${file.path}',
-            );
           }
-        }
 
-        // Replace content
-        file = await file.writeAsString(contents);
+          // Replace content
+          file = await file.writeAsString(contents);
+        } catch (e) {
+          Logger.error(e);
+        }
       }),
     );
   }
@@ -111,4 +117,20 @@ class FileSystemUtils {
       }
     }
   }
+
+  // For the moment ignored files are copied, then deleted...
+  static Future<void> deleteIgnoredFolders(
+    BrickConfig brickConfig,
+    String brickPath,
+  ) async {
+    for (final String ignore in brickConfig.brickIgnore ?? []) {
+      final String toDelete = join(brickPath, ignore);
+      if (FileSystemEntity.isDirectorySync(toDelete)) {
+        await Shell.rm(toDelete, recursive: true);
+      } else {
+        await Shell.rm(toDelete);
+      }
+      Logger.debug('$toDelete ignored.');
+    }
+  }
 }
diff --git a/tools/brick_generator/lib/models/brick_config.dart b/tools/brick_generator/lib/models/brick_config.dart
index ebeb935..cd3f8e5 100644
--- a/tools/brick_generator/lib/models/brick_config.dart
+++ b/tools/brick_generator/lib/models/brick_config.dart
@@ -22,6 +22,7 @@ const _nameKey = 'name';
 const _descriptionKey = 'description';
 const _versionKey = 'version';
 const _pathToBrickifyKey = 'path_to_brickify';
+const _brickIgnoreKey = 'brick_ignore';
 const _varsKey = 'vars';
 
 class BrickConfig {
@@ -29,6 +30,7 @@ class BrickConfig {
   String? description;
   String? version;
   String? pathToBrickify;
+  List<String>? brickIgnore;
   List<BrickVariable?>? variables;
 
   BrickConfig({
@@ -36,6 +38,7 @@ class BrickConfig {
     required this.description,
     required this.version,
     required this.pathToBrickify,
+    required this.brickIgnore,
     required this.variables,
   });
 
@@ -48,6 +51,9 @@ class BrickConfig {
           description: data[_descriptionKey] as String?,
           version: data[_versionKey] as String?,
           pathToBrickify: data[_pathToBrickifyKey] as String?,
+          brickIgnore: (data[_brickIgnoreKey] as YamlList?)
+              ?.map((dynamic element) => element as String)
+              .toList(),
           variables: (data[_varsKey] as YamlMap?)
               ?.map<dynamic, BrickVariable?>(
                 (dynamic key, dynamic value) =>
diff --git a/tools/brick_generator/lib/shell.dart b/tools/brick_generator/lib/shell.dart
index d3b2199..7eaac2f 100644
--- a/tools/brick_generator/lib/shell.dart
+++ b/tools/brick_generator/lib/shell.dart
@@ -26,6 +26,10 @@ class Shell {
   static Future<void> mkdir(String destination) {
     return _Cmd.run('mkdir', ['-p', destination]);
   }
+
+  static Future<void> rm(String target, {bool recursive = false}) {
+    return _Cmd.run('rm', ['-f${recursive ? "r" : ""}', target]);
+  }
 }
 
 class _Cmd {