diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs
index 9a28635..e97d69a 100644
--- a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs
+++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs
@@ -46,7 +46,7 @@ namespace Code.App
             DontDestroyOnLoad(infrastructureUnit);
             
             containerBuilder.AddSingleton(infrastructureUnit);
-            containerBuilder.AddSingleton(infrastructureUnit.GetComponent<ICoroutineRunner>(),
+            containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CoroutineRunner>(),
                 typeof(ICoroutineRunner));
             containerBuilder.AddSingleton(infrastructureUnit.AddComponent<AppStateMachine>());
             containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CameraStateMachine>());
diff --git a/Game/CourierOld/Assets/Code/Gameplay.meta b/Game/CourierOld/Assets/Code/Gameplay.meta
deleted file mode 100644
index 642bd06..0000000
--- a/Game/CourierOld/Assets/Code/Gameplay.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e4901b413afd4d7da914edf2a1e51f8f
-timeCreated: 1760627936
\ No newline at end of file
diff --git a/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab
index b7c60f0..a0b7a11 100644
--- a/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab
+++ b/Game/CourierOld/Assets/Resources/InfrastructureUnit.prefab
@@ -9,7 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6998769077926471982}
-  - component: {fileID: 6034382256224092200}
   m_Layer: 0
   m_Name: InfrastructureUnit
   m_TagString: Untagged
@@ -32,15 +31,3 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6034382256224092200
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2862254794148572251}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1c87e09de06474cb53bc7ebb77e90cd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Code.App.CoroutineRunner
diff --git a/Game/CourierOld/Assets/_Project.meta b/Game/CourierOld/Assets/_Project.meta
new file mode 100644
index 0000000..5a16a8e
--- /dev/null
+++ b/Game/CourierOld/Assets/_Project.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 92086eb0798f4ba0ab0c0a31d97c11f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/projectSettingsUpdater.xml b/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/projectSettingsUpdater.xml
new file mode 100644
index 0000000..ef20cb0
--- /dev/null
+++ b/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/workspace.xml b/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/workspace.xml
new file mode 100644
index 0000000..0e7035a
--- /dev/null
+++ b/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators/.idea/.idea.CodeGenerators/.idea/workspace.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile profileName="DebugRoslynSourceGenerator">CodeGenerators/CodeGenerators/CodeGenerators.csproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="2fdd2c2d-d000-48da-b5e6-16a9b3b1e859" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/../../../Code/Configs/App.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../../Code/Configs/Input.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../../_Project.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../CodeGenerators/.idea/.idea.CodeGenerators/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../CodeGenerators/.idea/.idea.CodeGenerators/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/.idea.CodeGenerators/.idea/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/.idea.CodeGenerators/.idea/indexLayout.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/CodeGenerators/CodeGenerators/ConfigGenerator.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/App/BootstrapInstaller.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Code/App/BootstrapInstaller.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/Configs/AppConfig.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/Configs/AppConfig.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Code/Configs/App.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/Configs/InputConfig.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/Configs/InputConfig.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Code/Configs/Input.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/Gameplay.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/StaticData/IStaticDataService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Code/StaticData/IStaticDataService.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Code/StaticData/StaticDataService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Code/StaticData/StaticDataService.cs" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../../../../.." />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 7
+}</component>
+  <component name="ProjectId" id="34KcUUcWOgSCRCMdkyTSirX0p8Y" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;ConfigCodeWriter&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/blackknight/Projects/CourierOld/Game/CourierOld/Assets/_Project/SourceGenerators~/CodeGenerators&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RunManager">
+    <configuration name="CodeGenerators: DebugRoslynSourceGenerator" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/CodeGenerators/CodeGenerators/CodeGenerators.csproj" />
+      <option name="LAUNCH_PROFILE_TFM" value=".NETStandard,Version=v2.0" />
+      <option name="LAUNCH_PROFILE_NAME" value="DebugRoslynSourceGenerator" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+      <option name="SEND_DEBUG_REQUEST" value="1" />
+      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+      <option name="AUTO_ATTACH_CHILDREN" value="0" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="2fdd2c2d-d000-48da-b5e6-16a9b3b1e859" name="Changes" comment="" />
+      <created>1760965720038</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1760965720038</updated>
+      <workItem from="1760965721145" duration="2467000" />
+      <workItem from="1760971518633" duration="2846000" />
+      <workItem from="1760976202729" duration="1801000" />
+      <workItem from="1760978021118" duration="703000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+</project>
\ No newline at end of file