diff --git a/{{cookiecutter.app_name}}/Common/Sources/Common/FeatureReducer.swift b/{{cookiecutter.app_name}}/Common/Sources/Common/FeatureReducer.swift
index 6ba1019..a14eaef 100644
--- a/{{cookiecutter.app_name}}/Common/Sources/Common/FeatureReducer.swift
+++ b/{{cookiecutter.app_name}}/Common/Sources/Common/FeatureReducer.swift
@@ -2,7 +2,7 @@
 //  FeatureReducer.swift
 //  Common
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Common/Sources/Common/Heap.swift b/{{cookiecutter.app_name}}/Common/Sources/Common/Heap.swift
index a8bc9f5..b7ee195 100644
--- a/{{cookiecutter.app_name}}/Common/Sources/Common/Heap.swift
+++ b/{{cookiecutter.app_name}}/Common/Sources/Common/Heap.swift
@@ -2,7 +2,7 @@
 //  Heap.swift
 //  Common
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/AppError.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/AppError.swift
index 1431870..803996f 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/AppError.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/AppError.swift
@@ -2,7 +2,7 @@
 //  AppError.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/Product.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/Product.swift
index a8a8c2a..e124544 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/Product.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Enitity/Product.swift
@@ -2,7 +2,7 @@
 //  Product.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/Repository.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/Repository.swift
index a9d19db..8b63bb3 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/Repository.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/Repository.swift
@@ -2,7 +2,7 @@
 //  Repository.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/UseCase.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/UseCase.swift
index 78c9869..366cdce 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/UseCase.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/Interface/UseCase.swift
@@ -2,7 +2,7 @@
 //  UseCase.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/PrepareCoreDataUseCase.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/PrepareCoreDataUseCase.swift
index c0fd941..fc14c96 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/PrepareCoreDataUseCase.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/PrepareCoreDataUseCase.swift
@@ -2,7 +2,7 @@
 //  PrepareCoreDataUseCase.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/ProductUseCase.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/ProductUseCase.swift
index 2d6beb9..caa3700 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/ProductUseCase.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/ProductUseCase.swift
@@ -2,7 +2,7 @@
 //  ProductUseCase.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/SaveProductUseCase.swift b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/SaveProductUseCase.swift
index f217a79..0e214fc 100644
--- a/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/SaveProductUseCase.swift
+++ b/{{cookiecutter.app_name}}/Domain/Sources/Domain/UseCases/SaveProductUseCase.swift
@@ -2,7 +2,7 @@
 //  SaveProductUseCase.swift
 //  Domain
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Features/Package.swift b/{{cookiecutter.app_name}}/Features/Package.swift
index 250a4d0..06387fb 100644
--- a/{{cookiecutter.app_name}}/Features/Package.swift
+++ b/{{cookiecutter.app_name}}/Features/Package.swift
@@ -8,8 +8,8 @@ let package = Package(
   platforms: [.macOS(.v12), .iOS(.v16)],
   products: [
     .library(
-      name: "App",
-      targets: ["App"]
+      name: "Product",
+      targets: ["Product"]
     ),
 
     .library(
@@ -28,7 +28,7 @@ let package = Package(
   ],
   targets: [
     .target(
-      name: "App",
+      name: "Product",
       dependencies: [
         "Counter",
         .product(name: "Common", package: "Common"),
diff --git a/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterFeature.swift b/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterFeature.swift
index 1ad7113..b42daf4 100644
--- a/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterFeature.swift
+++ b/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterFeature.swift
@@ -2,7 +2,7 @@
 //  CounterFeature.swift
 //  Features
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterView.swift b/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterView.swift
index 0b54e93..ac2533b 100644
--- a/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterView.swift
+++ b/{{cookiecutter.app_name}}/Features/Sources/Counter/CounterView.swift
@@ -2,7 +2,7 @@
 //  CounterView.swift
 //  Features
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Features/Sources/App/AppClient.swift b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductClient.swift
similarity index 77%
rename from {{cookiecutter.app_name}}/Features/Sources/App/AppClient.swift
rename to {{cookiecutter.app_name}}/Features/Sources/Product/ProductClient.swift
index 0b2b8d3..31b98e0 100644
--- a/{{cookiecutter.app_name}}/Features/Sources/App/AppClient.swift
+++ b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductClient.swift
@@ -1,8 +1,8 @@
 //
-//  AppClient.swift
+//  ProductClient.swift
 //  Features
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
@@ -12,7 +12,7 @@ import Foundation
 import NetworkPlatform
 import PersistentPlatform
 
-struct AppClient {
+struct ProductClient {
   var getProduct: any ProductUseCaseType
   var saveProduct: any SaveProductUseCaseType
   var prepareCoreData: any PrepareCoreDataUseCaseType
@@ -29,24 +29,24 @@ struct AppClient {
 }
 
 extension DependencyValues {
-  var appClient: AppClient {
-    get { self[AppClient.self] }
-    set { self[AppClient.self] = newValue }
+  var appClient: ProductClient {
+    get { self[ProductClient.self] }
+    set { self[ProductClient.self] = newValue }
   }
 }
 
-extension AppClient: DependencyKey {
-  public static var liveValue = AppClient(
+extension ProductClient: DependencyKey {
+  public static var liveValue = ProductClient(
     PrepareCoreDataUseCase(repository: PreparePersistentRepository.live),
     getProductUseCase: ProductUseCase(repository: RemoteProductRepository.live),
     saveProductUseCase: SaveProductUseCase(
       repository: PersistentProductRepository.live))
-  public static var testValue = AppClient(
+  public static var testValue = ProductClient(
     PrepareCoreDataUseCase(repository: PreparePersistentRepository.live),
     getProductUseCase: ProductUseCase(repository: RemoteProductRepository.stubbed),
     saveProductUseCase: SaveProductUseCase(
       repository: PersistentProductRepository.live))
-  public static var previewValue = AppClient(
+  public static var previewValue = ProductClient(
     PrepareCoreDataUseCase(repository: PreparePersistentRepository.live),
     getProductUseCase: ProductUseCase(repository: RemoteProductRepository.stubbed),
     saveProductUseCase: SaveProductUseCase(
diff --git a/{{cookiecutter.app_name}}/Features/Sources/App/AppFeature.swift b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductFeature.swift
similarity index 94%
rename from {{cookiecutter.app_name}}/Features/Sources/App/AppFeature.swift
rename to {{cookiecutter.app_name}}/Features/Sources/Product/ProductFeature.swift
index b9c670f..8df7542 100644
--- a/{{cookiecutter.app_name}}/Features/Sources/App/AppFeature.swift
+++ b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductFeature.swift
@@ -1,8 +1,8 @@
 //
-//  AppFeature.swift
+//  ProductFeature.swift
 //  Features
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
@@ -11,7 +11,7 @@ import ComposableArchitecture
 import Counter
 import Domain
 
-public struct AppFeature: FeatureReducer {
+public struct ProductFeature: FeatureReducer {
 
   @Dependency(\.appClient) var appClient
 
@@ -92,9 +92,7 @@ public struct AppFeature: FeatureReducer {
     }
   }
 
-  public func reduce(into state: inout State, internalAction: InternalAction)
-    -> Effect<Action>
-  {
+  public func reduce(into state: inout State, internalAction: InternalAction) -> Effect<Action> {
     switch internalAction {
     case let .productResponse(.success(product)):
       state.product = product
diff --git a/{{cookiecutter.app_name}}/Features/Sources/App/AppView.swift b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductView.swift
similarity index 79%
rename from {{cookiecutter.app_name}}/Features/Sources/App/AppView.swift
rename to {{cookiecutter.app_name}}/Features/Sources/Product/ProductView.swift
index 9d9258a..32e15c4 100644
--- a/{{cookiecutter.app_name}}/Features/Sources/App/AppView.swift
+++ b/{{cookiecutter.app_name}}/Features/Sources/Product/ProductView.swift
@@ -1,8 +1,8 @@
 //
-//  AppView.swift
+//  ProductView.swift
 //  Features
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
@@ -12,10 +12,10 @@ import Counter
 import SwiftUI
 
 @MainActor
-public struct AppView: View {
-  let store: StoreOf<AppFeature>
+public struct ProductView: View {
+  let store: StoreOf<ProductFeature>
 
-  public init(store: StoreOf<AppFeature>) {
+  public init(store: StoreOf<ProductFeature>) {
     self.store = store
   }
 
@@ -56,9 +56,9 @@ public struct AppView: View {
   }
 }
 
-extension StoreOf<AppFeature> {
+extension StoreOf<ProductFeature> {
   fileprivate var bindableDestination:
-    ComposableArchitecture.Bindable<StoreOf<AppFeature>>
+    ComposableArchitecture.Bindable<StoreOf<ProductFeature>>
   {
     return ComposableArchitecture.Bindable(self)
   }
@@ -66,14 +66,14 @@ extension StoreOf<AppFeature> {
 
 @MainActor
 extension View {
-  fileprivate func destinations(with store: StoreOf<AppFeature>) -> some View {
+  fileprivate func destinations(with store: StoreOf<ProductFeature>) -> some View {
     let bindableDestination = store.bindableDestination
     return showSheet(with: bindableDestination)
       .showFulllScreenCover(with: bindableDestination)
   }
 
   private func showSheet(
-    with destinationStore: ComposableArchitecture.Bindable<StoreOf<AppFeature>>
+    with destinationStore: ComposableArchitecture.Bindable<StoreOf<ProductFeature>>
   ) -> some View {
     let destinationStore = destinationStore.scope(
       state: \.destination?.sheet,
@@ -85,7 +85,7 @@ extension View {
   }
 
   private func showFulllScreenCover(
-    with destinationStore: ComposableArchitecture.Bindable<StoreOf<AppFeature>>
+    with destinationStore: ComposableArchitecture.Bindable<StoreOf<ProductFeature>>
   ) -> some View {
     let destinationStore = destinationStore.scope(
       state: \.destination?.fullScreenCover,
@@ -98,11 +98,11 @@ extension View {
 }
 
 #Preview {
-  AppView(
+  ProductView(
     store:
       .init(
-        initialState: AppFeature.State(),
-        reducer: { AppFeature() }
+        initialState: ProductFeature.State(),
+        reducer: { ProductFeature() }
       )
   )
 }
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/BuildConfiguration/BuildConfiguration.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/BuildConfiguration/BuildConfiguration.swift
index 6c5bc03..0ec299d 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/BuildConfiguration/BuildConfiguration.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/BuildConfiguration/BuildConfiguration.swift
@@ -2,7 +2,7 @@
 //  BuildConfiguration.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AppAPI.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AppAPI.swift
index c8cb934..10cb234 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AppAPI.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AppAPI.swift
@@ -2,8 +2,8 @@
 //  AppAPI.swift
 //  NetworkPlatform
 //
-//  Created by Rokon on 24/01/2024.
-//  Copyright © 2024 MLBD. All rights reserved.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import BuildConfiguration
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AuthAPI.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AuthAPI.swift
index 9dc73f0..5c5892a 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AuthAPI.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/API/AuthAPI.swift
@@ -2,8 +2,8 @@
 //  AuthAPI.swift
 //  NetworkPlatform
 //
-//  Created by Rokon on 24/01/2024.
-//  Copyright © 2024 MLBD. All rights reserved.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import Foundation
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/HTTPStatusCode.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/HTTPStatusCode.swift
index 6ca0d06..160de9a 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/HTTPStatusCode.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/HTTPStatusCode.swift
@@ -2,8 +2,8 @@
 //  HTTPStatusCode.swift
 //  NetworkPlatform
 //
-//  Created by Rokon on 24/01/2024.
-//  Copyright © 2024 MLBD. All rights reserved.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import Foundation
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/LocalNotification.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/LocalNotification.swift
index 679a3fe..d6300a5 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/LocalNotification.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/LocalNotification.swift
@@ -2,8 +2,8 @@
 //  LocalNotification.swift
 //  NetworkPlatform
 //
-//  Created by Rokon on 24/01/2024.
-//  Copyright © 2024 MLBD. All rights reserved.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import Combine
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/Stubbable.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/Stubbable.swift
index ffc56d1..0752488 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/Stubbable.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Common/Stubbable.swift
@@ -2,8 +2,8 @@
 //  Stubbable.swift
 //  NetworkPlatform
 //
-//  Created by Rokon on 24/01/2024.
-//  Copyright © 2024 MLBD. All rights reserved.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import Foundation
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/AppNetworking.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/AppNetworking.swift
index dad7a5b..0cc2208 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/AppNetworking.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/AppNetworking.swift
@@ -2,7 +2,7 @@
 //  AppNetworking.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/Networking.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/Networking.swift
index 75974dd..80fc3c5 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/Networking.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/Networking.swift
@@ -2,7 +2,7 @@
 //  Networking.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingError.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingError.swift
index 13e7202..d41e08f 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingError.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingError.swift
@@ -2,7 +2,7 @@
 //  NetworkingError.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingType.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingType.swift
index 388d844..3c86f3f 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingType.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Network/NetworkingType.swift
@@ -2,7 +2,7 @@
 //  NetworkingType.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Repository/RemoteProductRepository.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Repository/RemoteProductRepository.swift
index 4c82e27..111e06a 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Repository/RemoteProductRepository.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Repository/RemoteProductRepository.swift
@@ -2,7 +2,7 @@
 //  NetworkRepository.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Resources/StubbedResponse/Product.json b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Resources/StubbedResponse/Product.json
index aa98814..15905b7 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Resources/StubbedResponse/Product.json
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Resources/StubbedResponse/Product.json
@@ -1,7 +1,7 @@
 {
   "id": 1,
-  "title": "Rokon",
-  "price": 109.95,
+  "title": "Apple Watch",
+  "price": 250,
   "description": "Your perfect pack for everyday use and walks in the forest. Stash your laptop (up to 15 inches) in the padded sleeve, your everyday",
   "category": "men's clothing",
   "image": "https://fakestoreapi.com/img/81fPKd-2AYL._AC_SL1500_.jpg",
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/AnyPublisher+Extensions.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/AnyPublisher+Extensions.swift
index f536b13..5a9fd7e 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/AnyPublisher+Extensions.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/AnyPublisher+Extensions.swift
@@ -2,7 +2,7 @@
 //  AnyPublisher+Extensions.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/VerbosePlugin.swift b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/VerbosePlugin.swift
index b34c19e..8360ca5 100644
--- a/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/VerbosePlugin.swift
+++ b/{{cookiecutter.app_name}}/NetworkPlatform/Sources/NetworkPlatform/Utility/VerbosePlugin.swift
@@ -2,7 +2,7 @@
 //  VerbosePlugin.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/Constants+CoreData.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/Constants+CoreData.swift
index a08f048..f78de29 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/Constants+CoreData.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/Constants+CoreData.swift
@@ -2,7 +2,7 @@
 //  Constants+CoreData.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/DomainConvertible.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/DomainConvertible.swift
index 9f6bf26..38780ca 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/DomainConvertible.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/DomainConvertible.swift
@@ -2,7 +2,7 @@
 //  DomainConvertible.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Compatible.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Compatible.swift
index e1a0de9..9945e3a 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Compatible.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Compatible.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectModel+Compatible.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Resource.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Resource.swift
index e273932..96df93b 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Resource.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSManagedObjectModel/NSManagedObjectModel+Resource.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectModel+Resource.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSPersistentStoreCoordinator/NSPersistentStoreCoordinator+SQLite.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSPersistentStoreCoordinator/NSPersistentStoreCoordinator+SQLite.swift
index 223f52e..4e8e56d 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSPersistentStoreCoordinator/NSPersistentStoreCoordinator+SQLite.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Extensions/NSPersistentStoreCoordinator/NSPersistentStoreCoordinator+SQLite.swift
@@ -2,7 +2,7 @@
 //  NSPersistentStoreCoordinator+SQLite.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataClass.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataClass.swift
index f6a3ddb..3c6ebdc 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataClass.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataClass.swift
@@ -2,7 +2,7 @@
 //  Product+CoreDataClass.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataProperties.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataProperties.swift
index 61eecf6..e6cfd6f 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataProperties.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/MODefinition/Product+CoreDataProperties.swift
@@ -2,7 +2,7 @@
 //  Product+CoreDataProperties.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/PersistenceController.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/PersistenceController.swift
index 57a3524..1265d48 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/PersistenceController.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/PersistenceController.swift
@@ -2,7 +2,7 @@
 //  PersistenceController.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PersistentProductRepository.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PersistentProductRepository.swift
index 9aba5b8..ec4e683 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PersistentProductRepository.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PersistentProductRepository.swift
@@ -2,7 +2,7 @@
 //  PersistentRepository.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PreparePersistentRepository.swift b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PreparePersistentRepository.swift
index fbabf4a..f06a1b3 100644
--- a/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PreparePersistentRepository.swift
+++ b/{{cookiecutter.app_name}}/PersistentPlatform/Sources/PersistentPlatform/Repository/PreparePersistentRepository.swift
@@ -2,7 +2,7 @@
 //  PreparePersistentRepository.swift
 //  PersistentPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/Utilities/Sources/Utilities/Logger.swift b/{{cookiecutter.app_name}}/Utilities/Sources/Utilities/Logger.swift
index 1338dbf..7eb02a3 100644
--- a/{{cookiecutter.app_name}}/Utilities/Sources/Utilities/Logger.swift
+++ b/{{cookiecutter.app_name}}/Utilities/Sources/Utilities/Logger.swift
@@ -2,7 +2,7 @@
 //  VerbosePlugin.swift
 //  NetworkPlatform
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}.xcodeproj/project.pbxproj b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}.xcodeproj/project.pbxproj
index e4de207..8c744df 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}.xcodeproj/project.pbxproj
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}.xcodeproj/project.pbxproj
@@ -7,13 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2F0D066C2B76030C00442618 /* App in Frameworks */ = {isa = PBXBuildFile; productRef = 2F0D066B2B76030C00442618 /* App */; };
 		2F0D066E2B76035F00442618 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = 2F0D066D2B76035F00442618 /* ComposableArchitecture */; };
 		2F1CB98A291A097F0033C297 /* BuildConfiguration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2F1CB989291A097F0033C297 /* BuildConfiguration.plist */; };
-		2F7B0E5A273AD7AC00C68B1F /* MainApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E59273AD7AC00C68B1F /* MainApp.swift */; };
-		2F7B0E6B273AD7AD00C68B1F /* __cookiecutter_app_name__Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E6A273AD7AD00C68B1F /* __cookiecutter_app_name__Tests.swift */; };
-		2F7B0E75273AD7AD00C68B1F /* __cookiecutter_app_name__UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E74273AD7AD00C68B1F /* __cookiecutter_app_name__UITests.swift */; };
-		2F7B0E77273AD7AD00C68B1F /* __cookiecutter_app_name__UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E76273AD7AD00C68B1F /* __cookiecutter_app_name__UITestsLaunchTests.swift */; };
+		2F44CB232C3E52D30089EB21 /* Product in Frameworks */ = {isa = PBXBuildFile; productRef = 2F44CB222C3E52D30089EB21 /* Product */; };
+		2F7B0E5A273AD7AC00C68B1F /* {{cookiecutter.app_name}}App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E59273AD7AC00C68B1F /* {{cookiecutter.app_name}}App.swift */; };
+		2F7B0E6B273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E6A273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.swift */; };
+		2F7B0E75273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E74273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.swift */; };
+		2F7B0E77273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F7B0E76273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITestsLaunchTests.swift */; };
 		6782D570291252700015FCBB /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6782D5572912526F0015FCBB /* Preview Assets.xcassets */; };
 		6782D571291252700015FCBB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6782D558291252700015FCBB /* Assets.xcassets */; };
 		67B2B5C529127D3A00B2E0AC /* Staging.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 67B2B5BD29127D3A00B2E0AC /* Staging.xcconfig */; };
@@ -57,12 +57,12 @@
 		2F4989C3298E8F470007A245 /* Domain */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Domain; sourceTree = "<group>"; };
 		2F4989C5298E8F9E0007A245 /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Features; sourceTree = "<group>"; };
 		2F7B0E56273AD7AC00C68B1F /* {{cookiecutter.app_name}}.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "{{cookiecutter.app_name}}.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F7B0E59273AD7AC00C68B1F /* MainApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainApp.swift; sourceTree = "<group>"; };
+		2F7B0E59273AD7AC00C68B1F /* {{cookiecutter.app_name}}App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "{{cookiecutter.app_name}}App.swift"; sourceTree = "<group>"; };
 		2F7B0E66273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "{{cookiecutter.app_name}}Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F7B0E6A273AD7AD00C68B1F /* __cookiecutter_app_name__Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = __cookiecutter_app_name__Tests.swift; sourceTree = "<group>"; };
+		2F7B0E6A273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "{{cookiecutter.app_name}}Tests.swift"; sourceTree = "<group>"; };
 		2F7B0E70273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "{{cookiecutter.app_name}}UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F7B0E74273AD7AD00C68B1F /* __cookiecutter_app_name__UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = __cookiecutter_app_name__UITests.swift; sourceTree = "<group>"; };
-		2F7B0E76273AD7AD00C68B1F /* __cookiecutter_app_name__UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = __cookiecutter_app_name__UITestsLaunchTests.swift; sourceTree = "<group>"; };
+		2F7B0E74273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "{{cookiecutter.app_name}}UITests.swift"; sourceTree = "<group>"; };
+		2F7B0E76273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "{{cookiecutter.app_name}}UITestsLaunchTests.swift"; sourceTree = "<group>"; };
 		2F88959D2B75F8FB0047F158 /* PersistentPlatform */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = PersistentPlatform; sourceTree = "<group>"; };
 		2F9DFD462990EA1800611A47 /* Utilities */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Utilities; sourceTree = "<group>"; };
 		2FBF5D1D2A73C01B00527C7D /* Common */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Common; sourceTree = "<group>"; };
@@ -81,8 +81,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2F44CB232C3E52D30089EB21 /* Product in Frameworks */,
 				2F0D066E2B76035F00442618 /* ComposableArchitecture in Frameworks */,
-				2F0D066C2B76030C00442618 /* App in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -106,7 +106,7 @@
 		2F1CB9802918B3230033C297 /* Application */ = {
 			isa = PBXGroup;
 			children = (
-				2F7B0E59273AD7AC00C68B1F /* MainApp.swift */,
+				2F7B0E59273AD7AC00C68B1F /* {{cookiecutter.app_name}}App.swift */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -158,7 +158,7 @@
 		2F7B0E69273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests */ = {
 			isa = PBXGroup;
 			children = (
-				2F7B0E6A273AD7AD00C68B1F /* __cookiecutter_app_name__Tests.swift */,
+				2F7B0E6A273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.swift */,
 			);
 			path = "{{cookiecutter.app_name}}Tests";
 			sourceTree = "<group>";
@@ -166,8 +166,8 @@
 		2F7B0E73273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests */ = {
 			isa = PBXGroup;
 			children = (
-				2F7B0E74273AD7AD00C68B1F /* __cookiecutter_app_name__UITests.swift */,
-				2F7B0E76273AD7AD00C68B1F /* __cookiecutter_app_name__UITestsLaunchTests.swift */,
+				2F7B0E74273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.swift */,
+				2F7B0E76273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITestsLaunchTests.swift */,
 			);
 			path = "{{cookiecutter.app_name}}UITests";
 			sourceTree = "<group>";
@@ -254,8 +254,8 @@
 			);
 			name = "{{cookiecutter.app_name}}";
 			packageProductDependencies = (
-				2F0D066B2B76030C00442618 /* App */,
 				2F0D066D2B76035F00442618 /* ComposableArchitecture */,
+				2F44CB222C3E52D30089EB21 /* Product */,
 			);
 			productName = "{{cookiecutter.app_name}}";
 			productReference = 2F7B0E56273AD7AC00C68B1F /* {{cookiecutter.app_name}}.app */;
@@ -400,7 +400,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2F7B0E5A273AD7AC00C68B1F /* MainApp.swift in Sources */,
+				2F7B0E5A273AD7AC00C68B1F /* {{cookiecutter.app_name}}App.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -408,7 +408,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2F7B0E6B273AD7AD00C68B1F /* __cookiecutter_app_name__Tests.swift in Sources */,
+				2F7B0E6B273AD7AD00C68B1F /* {{cookiecutter.app_name}}Tests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -416,8 +416,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2F7B0E77273AD7AD00C68B1F /* __cookiecutter_app_name__UITestsLaunchTests.swift in Sources */,
-				2F7B0E75273AD7AD00C68B1F /* __cookiecutter_app_name__UITests.swift in Sources */,
+				2F7B0E77273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITestsLaunchTests.swift in Sources */,
+				2F7B0E75273AD7AD00C68B1F /* {{cookiecutter.app_name}}UITests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1340,14 +1340,14 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		2F0D066B2B76030C00442618 /* App */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = App;
-		};
 		2F0D066D2B76035F00442618 /* ComposableArchitecture */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = ComposableArchitecture;
 		};
+		2F44CB222C3E52D30089EB21 /* Product */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = Product;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 2F7B0E4E273AD7AC00C68B1F /* Project object */;
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/MainApp.swift b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/MainApp.swift
deleted file mode 100644
index 710e503..0000000
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/MainApp.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  MainApp.swift
-//  {{cookiecutter.app_name}}
-//
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
-//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
-//
-
-import App
-import ComposableArchitecture
-import SwiftUI
-
-#warning("Please rename to your app name")
-@main
-struct MainApp: App {
-  var body: some Scene {
-    let store = Store(
-      initialState: AppFeature.State(),
-      reducer: { AppFeature() }
-    )
-
-    WindowGroup {
-      AppView(store: store)
-    }
-  }
-}
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/{{cookiecutter.app_name}}App.swift b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/{{cookiecutter.app_name}}App.swift
new file mode 100644
index 0000000..3c1bff0
--- /dev/null
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Application/{{cookiecutter.app_name}}App.swift
@@ -0,0 +1,27 @@
+//
+//  MainApp.swift
+//  {{cookiecutter.app_name}}
+//
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
+//  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
+//
+
+import ComposableArchitecture
+import Product
+import SwiftUI
+
+// MARK: To run the boilerplate on local machine. Please rename '{{cookiecutter.app_name}}App' to any suitable name e.g 'HelloWordApp' to avoid build error.
+
+@main
+struct {{cookiecutter.app_name}}App: App {
+    var body: some Scene {
+      let store = Store(
+        initialState: ProductFeature.State(),
+        reducer: { ProductFeature() }
+      )
+
+      WindowGroup {
+          ProductView(store: store)
+      }
+    }
+}
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Development/Development.xcconfig b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Development/Development.xcconfig
index 195c1ea..1c83d58 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Development/Development.xcconfig
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Development/Development.xcconfig
@@ -2,7 +2,7 @@
 //  Configuration.xcconfig
 //  {{cookiecutter.app_name}}
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Production/Production.xcconfig b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Production/Production.xcconfig
index d269d5b..6db8f4c 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Production/Production.xcconfig
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Production/Production.xcconfig
@@ -2,7 +2,7 @@
 //  Production.xcconfig
 //  {{cookiecutter.app_name}}
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Staging/Staging.xcconfig b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Staging/Staging.xcconfig
index e41b280..0feda4f 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Staging/Staging.xcconfig
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/Resources/Configurations/Staging/Staging.xcconfig
@@ -2,7 +2,7 @@
 //  Staging.xcconfig
 //  {{cookiecutter.app_name}}
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/__cookiecutter_app_name__Tests.swift b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/{{cookiecutter.app_name}}Tests.swift
similarity index 78%
rename from {{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/__cookiecutter_app_name__Tests.swift
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/{{cookiecutter.app_name}}Tests.swift
index 02b7956..04c16ed 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/__cookiecutter_app_name__Tests.swift
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}Tests/{{cookiecutter.app_name}}Tests.swift
@@ -1,17 +1,16 @@
 //
-//  __cookiecutter_app_name__Tests.swift
+//  {{cookiecutter.app_name}}Tests.swift
 //  {{cookiecutter.app_name}}Tests
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import XCTest
 
-@testable import __cookiecutter_app_name__
+@testable import {{cookiecutter.app_name}}
 
-#warning("Please rename to your app name")
-class AppTests: XCTestCase {
+class {{cookiecutter.app_name}}Tests: XCTestCase {
 
   override func setUpWithError() throws {
     // Put setup code here. This method is called before the invocation of each test method in the class.
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITests.swift b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITests.swift
similarity index 87%
rename from {{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITests.swift
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITests.swift
index 8f973ec..dfc0fd6 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITests.swift
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITests.swift
@@ -1,15 +1,14 @@
 //
-//  __cookiecutter_app_name__UITests.swift
+//  {{cookiecutter.app_name}}UITests.swift
 //  {{cookiecutter.app_name}}UITests
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import XCTest
 
-#warning("Please rename to your app name")
-class AppUITests: XCTestCase {
+class {{cookiecutter.app_name}}UITests: XCTestCase {
 
   override func setUpWithError() throws {
     // Put setup code here. This method is called before the invocation of each test method in the class.
diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITestsLaunchTests.swift b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITestsLaunchTests.swift
similarity index 77%
rename from {{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITestsLaunchTests.swift
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITestsLaunchTests.swift
index 313845f..818a488 100644
--- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/__cookiecutter_app_name__UITestsLaunchTests.swift
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}UITests/{{cookiecutter.app_name}}UITestsLaunchTests.swift
@@ -1,15 +1,14 @@
 //
-//  __cookiecutter_app_name__UITestsLaunchTests.swift
+//  {{cookiecutter.app_name}}UITestsLaunchTests.swift
 //  {{cookiecutter.app_name}}UITests
 //
-//  Created by {{ cookiecutter.creator }} on {% now 'utc', '%d/%m/%Y' %}.
+//  Created by {{cookiecutter.creator}} on {% now 'utc', '%d/%m/%Y' %}.
 //  Copyright © {% now 'utc', '%Y' %} {{cookiecutter.company_name}}. All rights reserved.
 //
 
 import XCTest
 
-#warning("Please rename to your app name")
-class AppUITestsLaunchTests: XCTestCase {
+class {{cookiecutter.app_name}}UITestsLaunchTests: XCTestCase {
 
   override class var runsForEachTargetApplicationUIConfiguration: Bool {
     true