diff --git a/.gitignore b/.gitignore
index 57e85a4..9f11b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 .idea/
-node_modules/
-dist/
diff --git a/commands/code/remember.toml b/commands/code/remember.toml
deleted file mode 100644
index 9e6de43..0000000
--- a/commands/code/remember.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-prompt = """
-Remembering fact: {{args}}
-!{${extensionPath}/claude/code/scripts/capture-context.sh "{{args}}" "user"}
-"""
diff --git a/google/gemini-cli/.gitignore b/google/gemini-cli/.gitignore
new file mode 100644
index 0000000..b947077
--- /dev/null
+++ b/google/gemini-cli/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+dist/
diff --git a/GEMINI.md b/google/gemini-cli/GEMINI.md
similarity index 100%
rename from GEMINI.md
rename to google/gemini-cli/GEMINI.md
diff --git a/google/gemini-cli/commands/code/remember.toml b/google/gemini-cli/commands/code/remember.toml
new file mode 100644
index 0000000..648599c
--- /dev/null
+++ b/google/gemini-cli/commands/code/remember.toml
@@ -0,0 +1,4 @@
+prompt = """
+Remembering fact: {{args}}
+!{${extensionPath}/../../claude/code/scripts/capture-context.sh "{{args}}" "user"}
+"""
diff --git a/commands/code/yes.toml b/google/gemini-cli/commands/code/yes.toml
similarity index 100%
rename from commands/code/yes.toml
rename to google/gemini-cli/commands/code/yes.toml
diff --git a/commands/qa/fix.toml b/google/gemini-cli/commands/qa/fix.toml
similarity index 100%
rename from commands/qa/fix.toml
rename to google/gemini-cli/commands/qa/fix.toml
diff --git a/commands/qa/qa.toml b/google/gemini-cli/commands/qa/qa.toml
similarity index 100%
rename from commands/qa/qa.toml
rename to google/gemini-cli/commands/qa/qa.toml
diff --git a/gemini-extension.json b/google/gemini-cli/gemini-extension.json
similarity index 100%
rename from gemini-extension.json
rename to google/gemini-cli/gemini-extension.json
diff --git a/hooks/hooks.json b/google/gemini-cli/hooks/hooks.json
similarity index 77%
rename from hooks/hooks.json
rename to google/gemini-cli/hooks/hooks.json
index 1f6555d..50f0453 100644
--- a/hooks/hooks.json
+++ b/google/gemini-cli/hooks/hooks.json
@@ -6,7 +6,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "${extensionPath}/claude/code/hooks/prefer-core.sh"
+                        "command": "${extensionPath}/../../claude/code/hooks/prefer-core.sh"
                     }
                 ],
                 "description": "Block destructive commands (rm -rf, sed -i, xargs rm) and enforce core CLI"
@@ -16,7 +16,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "${extensionPath}/claude/code/scripts/block-docs.sh"
+                        "command": "${extensionPath}/../../claude/code/scripts/block-docs.sh"
                     }
                 ],
                 "description": "Block random .md file creation"
@@ -28,7 +28,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "${extensionPath}/claude/code/scripts/go-format.sh"
+                        "command": "${extensionPath}/../../claude/code/scripts/go-format.sh"
                     }
                 ],
                 "description": "Auto-format Go files after edits"
@@ -38,7 +38,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "${extensionPath}/claude/code/scripts/php-format.sh"
+                        "command": "${extensionPath}/../../claude/code/scripts/php-format.sh"
                     }
                 ],
                 "description": "Auto-format PHP files after edits"
@@ -48,7 +48,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "${extensionPath}/claude/code/scripts/check-debug.sh"
+                        "command": "${extensionPath}/../../claude/code/scripts/check-debug.sh"
                     }
                 ],
                 "description": "Warn about debug statements (dd, dump, fmt.Println)"
diff --git a/package-lock.json b/google/gemini-cli/package-lock.json
similarity index 100%
rename from package-lock.json
rename to google/gemini-cli/package-lock.json
diff --git a/package.json b/google/gemini-cli/package.json
similarity index 100%
rename from package.json
rename to google/gemini-cli/package.json
diff --git a/src/index.ts b/google/gemini-cli/src/index.ts
similarity index 100%
rename from src/index.ts
rename to google/gemini-cli/src/index.ts
diff --git a/tsconfig.json b/google/gemini-cli/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to google/gemini-cli/tsconfig.json
diff --git a/skills b/skills
deleted file mode 120000
index 8eb16e9..0000000
--- a/skills
+++ /dev/null
@@ -1 +0,0 @@
-claude/code/skills
\ No newline at end of file