diff --git a/framework/core/src/Console/GenerateExtensionCommand.php b/framework/core/src/Console/GenerateExtensionCommand.php
index caa0ab873..d42e77e8c 100644
--- a/framework/core/src/Console/GenerateExtensionCommand.php
+++ b/framework/core/src/Console/GenerateExtensionCommand.php
@@ -94,7 +94,7 @@ class GenerateExtensionCommand extends Command
 
         file_put_contents($dir.'/flarum.json', json_encode($manifest, JSON_PRETTY_PRINT));
 
-        passthru("cd $dir; composer install; cd js; npm install; gulp");
+        passthru("cd $dir; composer install; cd js/forum; npm install; gulp");
 
         $this->info('Extension "'.$name.'" generated!');
     }
diff --git a/framework/core/stubs/extension/js/Gulpfile.js b/framework/core/stubs/extension/js/forum/Gulpfile.js
similarity index 100%
rename from framework/core/stubs/extension/js/Gulpfile.js
rename to framework/core/stubs/extension/js/forum/Gulpfile.js
diff --git a/framework/core/stubs/extension/js/package.json b/framework/core/stubs/extension/js/forum/package.json
similarity index 100%
rename from framework/core/stubs/extension/js/package.json
rename to framework/core/stubs/extension/js/forum/package.json
diff --git a/framework/core/stubs/extension/js/src/main.js b/framework/core/stubs/extension/js/forum/src/main.js
similarity index 100%
rename from framework/core/stubs/extension/js/src/main.js
rename to framework/core/stubs/extension/js/forum/src/main.js
diff --git a/framework/core/stubs/extension/less/extension.less b/framework/core/stubs/extension/less/forum/extension.less
similarity index 100%
rename from framework/core/stubs/extension/less/extension.less
rename to framework/core/stubs/extension/less/forum/extension.less
diff --git a/framework/core/stubs/extension/src/Listeners/AddClientAssets.php b/framework/core/stubs/extension/src/Listeners/AddClientAssets.php
index 4a3634b50..a342bd216 100755
--- a/framework/core/stubs/extension/src/Listeners/AddClientAssets.php
+++ b/framework/core/stubs/extension/src/Listeners/AddClientAssets.php
@@ -20,8 +20,8 @@ class AddClientAssets
     public function addAssets(BuildClientView $event)
     {
         $event->forumAssets([
-            __DIR__.'/../../js/dist/extension.js',
-            __DIR__.'/../../less/extension.less'
+            __DIR__.'/../../js/forum/dist/extension.js',
+            __DIR__.'/../../less/forum/extension.less'
         ]);
 
         $event->forumBootstrapper('{{name}}/main');