diff --git a/scripts/startRebuildOnSrcChange.ts b/scripts/startRebuildOnSrcChange.ts
index f091b3f2..c31eaa71 100644
--- a/scripts/startRebuildOnSrcChange.ts
+++ b/scripts/startRebuildOnSrcChange.ts
@@ -28,7 +28,7 @@ export function startRebuildOnSrcChange() {
 
     console.log(chalk.green("Watching for changes in src/"));
 
-    chokidar.watch("src", { ignoreInitial: true }).on("all", async () => {
+    chokidar.watch(["src", "stories"], { ignoreInitial: true }).on("all", async () => {
         await waitForDebounce();
 
         runYarnBuild();
diff --git a/src/bin/add-story.ts b/src/bin/add-story.ts
index cd69b6e2..8709cc6d 100644
--- a/src/bin/add-story.ts
+++ b/src/bin/add-story.ts
@@ -75,14 +75,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         process.exit(-1);
     }
 
-    {
-        const targetDirPath = pathDirname(targetFilePath);
-
-        if (!fs.existsSync(targetDirPath)) {
-            fs.mkdirSync(targetDirPath, { recursive: true });
-        }
-    }
-
     const componentCode = fs
         .readFileSync(
             pathJoin(
@@ -93,13 +85,25 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                 componentBasename
             )
         )
-        .toString("utf8");
+        .toString("utf8")
+        .replace('import React from "react";\n', "");
+
+    {
+        const targetDirPath = pathDirname(targetFilePath);
+
+        if (!fs.existsSync(targetDirPath)) {
+            fs.mkdirSync(targetDirPath, { recursive: true });
+        }
+    }
 
     fs.writeFileSync(targetFilePath, Buffer.from(componentCode, "utf8"));
 
     console.log(
-        `${chalk.green("✓")} ${chalk.bold(
-            pathJoin(".", pathRelative(process.cwd(), targetFilePath))
-        )} copy pasted from the Keycloakify source code into your project`
+        [
+            `${chalk.green("✓")} ${chalk.bold(
+                pathJoin(".", pathRelative(process.cwd(), targetFilePath))
+            )} copy pasted from the Keycloakify source code into your project`,
+            `You can start storybook with ${chalk.bold("yarn storybook")}`
+        ].join("\n")
     );
 }
diff --git a/src/bin/eject-page.ts b/src/bin/eject-page.ts
index f7930882..64e6276b 100644
--- a/src/bin/eject-page.ts
+++ b/src/bin/eject-page.ts
@@ -113,14 +113,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         process.exit(-1);
     }
 
-    {
-        const targetDirPath = pathDirname(targetFilePath);
-
-        if (!fs.existsSync(targetDirPath)) {
-            fs.mkdirSync(targetDirPath, { recursive: true });
-        }
-    }
-
     const componentCode = fs
         .readFileSync(
             pathJoin(
@@ -133,6 +125,14 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         )
         .toString("utf8");
 
+    {
+        const targetDirPath = pathDirname(targetFilePath);
+
+        if (!fs.existsSync(targetDirPath)) {
+            fs.mkdirSync(targetDirPath, { recursive: true });
+        }
+    }
+
     fs.writeFileSync(targetFilePath, Buffer.from(componentCode, "utf8"));
 
     console.log(
diff --git a/stories/account/pages/Pasword.stories.tsx b/stories/account/pages/Password.stories.tsx
similarity index 100%
rename from stories/account/pages/Pasword.stories.tsx
rename to stories/account/pages/Password.stories.tsx