diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 19f4e76..d257e62 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -1,6 +1,6 @@
 {
   "name": "holocron",
-  "owner": { "name": "Your Name", "email": "you@example.com" },
+  "owner": { "name": "Defame1297", "email": "defame1297@rkdr.net" },
   "description": "AI development skills for Claude Code and GitHub Copilot CLI — factory, design, implement, review, and cross-cutting workflows.",
   "version": "0.1.0",
   "plugins": [
diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index b0b8dc1..d257e62 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -1,10 +1,8 @@
 {
   "name": "holocron",
-  "owner": { "name": "Your Name", "email": "you@example.com" },
-  "metadata": {
-    "description": "AI development skills for Claude Code and GitHub Copilot CLI — factory, design, implement, review, and cross-cutting workflows.",
-    "version": "0.1.0"
-  },
+  "owner": { "name": "Defame1297", "email": "defame1297@rkdr.net" },
+  "description": "AI development skills for Claude Code and GitHub Copilot CLI — factory, design, implement, review, and cross-cutting workflows.",
+  "version": "0.1.0",
   "plugins": [
     {
       "name": "hello-world",
diff --git a/plugins/kyberforge/.claude-plugin/plugin.json b/plugins/kyberforge/.claude-plugin/plugin.json
index 8bc6b8d..fbc1360 100644
--- a/plugins/kyberforge/.claude-plugin/plugin.json
+++ b/plugins/kyberforge/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "kyberforge",
-  "displayName": "kyberforge",
+  "displayName": "Kyberforge",
   "description": "Skills and agents for creating, maintaining, and managing a Claude Code / Copilot CLI plugin marketplace.",
   "author": { "name": "Defame1297", "url": "https://git.dev.rkdr.net/Defame1297/" },
   "license": "MIT",
diff --git a/plugins/kyberforge/hooks.json b/plugins/kyberforge/hooks.json
index b9820d5..deffac9 100644
--- a/plugins/kyberforge/hooks.json
+++ b/plugins/kyberforge/hooks.json
@@ -1,3 +1,3 @@
 {
-  "hooks": []
+  "hooks": {}
 }
diff --git a/plugins/kyberforge/tests/evals/marketplace-architect/eval.yaml b/plugins/kyberforge/skills/marketplace-architect/evals/eval.yaml
similarity index 100%
rename from plugins/kyberforge/tests/evals/marketplace-architect/eval.yaml
rename to plugins/kyberforge/skills/marketplace-architect/evals/eval.yaml
diff --git a/plugins/kyberforge/tests/test_scripts.sh b/plugins/kyberforge/skills/marketplace-architect/scripts/test_scripts.sh
similarity index 98%
rename from plugins/kyberforge/tests/test_scripts.sh
rename to plugins/kyberforge/skills/marketplace-architect/scripts/test_scripts.sh
index 3de91d8..8987914 100755
--- a/plugins/kyberforge/tests/test_scripts.sh
+++ b/plugins/kyberforge/skills/marketplace-architect/scripts/test_scripts.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-SCRIPTS_DIR="$(cd "$(dirname "$0")/../skills/marketplace-architect/scripts" && pwd)"
+SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd)"
 PASS=0; FAIL=0
 # Use += to avoid ((var++)) returning 0 exit code when var was 0 under set -e
 
diff --git a/plugins/kyberforge/tests/evals/create-plugin/eval.yaml b/plugins/kyberforge/skills/plugin-create/evals/eval.yaml
similarity index 100%
rename from plugins/kyberforge/tests/evals/create-plugin/eval.yaml
rename to plugins/kyberforge/skills/plugin-create/evals/eval.yaml
diff --git a/plugins/kyberforge/tests/evals/write-eval/eval.yaml b/plugins/kyberforge/skills/write-eval/evals/eval.yaml
similarity index 100%
rename from plugins/kyberforge/tests/evals/write-eval/eval.yaml
rename to plugins/kyberforge/skills/write-eval/evals/eval.yaml
diff --git a/plugins/kyberforge/tests/evals/write-skill/eval.yaml b/plugins/kyberforge/skills/write-skill/evals/eval.yaml
similarity index 100%
rename from plugins/kyberforge/tests/evals/write-skill/eval.yaml
rename to plugins/kyberforge/skills/write-skill/evals/eval.yaml