diff --git a/.idea/develop.iml b/.idea/develop.iml
index 6f31f397a44..f79d793af9f 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -10,8 +10,6 @@
       <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests/Feature" isTestSource="true" packagePrefix="Hyde\Framework\Testing\Feature\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests/Unit" isTestSource="true" packagePrefix="Hyde\Framework\Testing\Unit\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/hyde/tests/Feature" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/storage/app" />
-      <excludeFolder url="file://$MODULE_DIR$/storage/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyde" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyde/framework" />
       <excludeFolder url="file://$MODULE_DIR$/packages/realtime-compiler/vendor/hyde" />
@@ -25,6 +23,8 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/vimeo/psalm" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/path-util" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/netresearch/jsonmapper" />
+      <excludeFolder url="file://$MODULE_DIR$/app/storage/framework" />
+      <excludeFolder url="file://$MODULE_DIR$/app/storage/app" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/storage/app/.gitignore b/app/storage/app/.gitignore
similarity index 100%
rename from storage/app/.gitignore
rename to app/storage/app/.gitignore
diff --git a/storage/framework/cache/.gitignore b/app/storage/framework/cache/.gitignore
similarity index 100%
rename from storage/framework/cache/.gitignore
rename to app/storage/framework/cache/.gitignore
diff --git a/storage/framework/cache/data/.gitignore b/app/storage/framework/cache/data/.gitignore
similarity index 100%
rename from storage/framework/cache/data/.gitignore
rename to app/storage/framework/cache/data/.gitignore
diff --git a/storage/framework/views/.gitignore b/app/storage/framework/views/.gitignore
similarity index 100%
rename from storage/framework/views/.gitignore
rename to app/storage/framework/views/.gitignore
diff --git a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
index 800373fb217..4d51a058344 100644
--- a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
+++ b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
@@ -18,7 +18,7 @@ class PackageDiscoverCommand extends BaseCommand
 
     public function handle(PackageManifest $manifest): void
     {
-        $manifest->manifestPath = Hyde::path('storage/framework/cache/packages.php');
+        $manifest->manifestPath = Hyde::path('app/storage/framework/cache/packages.php');
         parent::handle($manifest);
     }
 }
diff --git a/packages/framework/src/Foundation/Application.php b/packages/framework/src/Foundation/Application.php
index 005364ce127..bc68a103020 100644
--- a/packages/framework/src/Foundation/Application.php
+++ b/packages/framework/src/Foundation/Application.php
@@ -9,6 +9,8 @@
  */
 class Application extends \LaravelZero\Framework\Application
 {
+    protected $storagePath = 'app/storage';
+
     /**
      * {@inheritdoc}
      */
@@ -25,6 +27,6 @@ protected function registerBaseBindings(): void
     public function getCachedPackagesPath(): string
     {
         // Since we have a custom path for the cache directory, we need to return it here.
-        return 'storage/framework/cache/packages.php';
+        return 'app/storage/framework/cache/packages.php';
     }
 }
diff --git a/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
index fa648d6e901..e6f155e50fc 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
@@ -57,7 +57,7 @@ protected function getManifestPath(): string
     {
         return Hyde::path(config(
             'hyde.build_manifest_path',
-            'storage/framework/cache/build-manifest.json'
+            'app/storage/framework/cache/build-manifest.json'
         ));
     }
 
diff --git a/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php b/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
index 033b43c65d1..7a3d1995f21 100644
--- a/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
@@ -21,8 +21,8 @@ public function test_package_discover_command_can_run()
     public function test_package_discover_command_registers_manifest_path()
     {
         $this->artisan('package:discover')->assertExitCode(0);
-        $this->assertEquals(Hyde::path('storage/framework/cache/packages.php'),
+        $this->assertEquals(Hyde::path('app/storage/framework/cache/packages.php'),
             $this->app->make(PackageManifest::class)->manifestPath);
-        $this->assertFileExists(Hyde::path('storage/framework/cache/packages.php'));
+        $this->assertFileExists(Hyde::path('app/storage/framework/cache/packages.php'));
     }
 }
diff --git a/packages/framework/tests/Unit/GenerateBuildManifestTest.php b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
index ff45cb5cf93..f3fbe223e4e 100644
--- a/packages/framework/tests/Unit/GenerateBuildManifestTest.php
+++ b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
@@ -18,9 +18,9 @@ public function test_action_generates_build_manifest()
     {
         (new GenerateBuildManifest())->run();
 
-        $this->assertFileExists(Hyde::path('storage/framework/cache/build-manifest.json'));
+        $this->assertFileExists(Hyde::path('app/storage/framework/cache/build-manifest.json'));
 
-        $manifest = json_decode(file_get_contents(Hyde::path('storage/framework/cache/build-manifest.json')), true);
+        $manifest = json_decode(file_get_contents(Hyde::path('app/storage/framework/cache/build-manifest.json')), true);
 
         $this->assertIsArray($manifest);