diff --git a/bootstrap.sh b/bootstrap.sh
index 65195f8..635ea3f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,10 +5,11 @@ REPO="/mnt/projekte/claude-workflow"
 
 echo "=== Claude-Workflow Bootstrap ==="
 
-# Skills
+# Skills (als Verzeichnis-Symlinks: ~/.claude/skills/<name> → repo/skills/<name>/)
 mkdir -p ~/.claude/skills
-for f in "$REPO/skills/"*.md; do
-    ln -sf "$f" ~/.claude/skills/
+for d in "$REPO/skills/"/*/; do
+    name=$(basename "$d")
+    ln -sf "$d" ~/.claude/skills/"$name"
 done
 echo "✓ Skills verlinkt"
 
diff --git a/skills/go.md b/skills/go/SKILL.md
similarity index 100%
rename from skills/go.md
rename to skills/go/SKILL.md
diff --git a/skills/plan-review.md b/skills/plan-review/SKILL.md
similarity index 100%
rename from skills/plan-review.md
rename to skills/plan-review/SKILL.md
diff --git a/skills/story.md b/skills/story/SKILL.md
similarity index 100%
rename from skills/story.md
rename to skills/story/SKILL.md