diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 29668ba..9fa4956 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -1,14 +1,14 @@
 {
-  "name": "puelpan-claude",
+  "name": "puelpan",
   "owner": {
     "name": "Juan Puelpan",
     "email": "juan@puelpan.com"
   },
   "plugins": [
     {
-      "name": "github",
-      "source": "./github",
-      "description": "Git and Github utility commands",
+      "name": "development",
+      "source": "./development",
+      "description": "Development utility commands",
       "version": "1.0.0",
       "author": {
         "name": "Juan Puelpan"
diff --git a/development/.claude-plugin/plugin.json b/development/.claude-plugin/plugin.json
new file mode 100644
index 0000000..e3807b1
--- /dev/null
+++ b/development/.claude-plugin/plugin.json
@@ -0,0 +1,8 @@
+{
+  "name": "development",
+  "description": "Collection of claude commands to ease the development process with github issues, PRs and more",
+  "version": "1.0.0",
+  "author": {
+    "name": "Juan Puelpan"
+  }
+}
diff --git a/github/commands/commit.md b/development/commands/commit.md
similarity index 100%
rename from github/commands/commit.md
rename to development/commands/commit.md
diff --git a/github/commands/create-plan.md b/development/commands/create-plan.md
similarity index 100%
rename from github/commands/create-plan.md
rename to development/commands/create-plan.md
diff --git a/github/commands/create-pr.md b/development/commands/create-pr.md
similarity index 100%
rename from github/commands/create-pr.md
rename to development/commands/create-pr.md
diff --git a/github/commands/execute-plan.md b/development/commands/execute-plan.md
similarity index 98%
rename from github/commands/execute-plan.md
rename to development/commands/execute-plan.md
index d193490..76af9dc 100644
--- a/github/commands/execute-plan.md
+++ b/development/commands/execute-plan.md
@@ -1,4 +1,4 @@
-# Excecute plan
+# Execute plan
 
 Execute a plan from GitHub issue or comment: $ARGUMENTS
 
diff --git a/github/commands/pr-review.md b/development/commands/pr-review.md
similarity index 100%
rename from github/commands/pr-review.md
rename to development/commands/pr-review.md
diff --git a/github/.claude-plugin/plugin.json b/github/.claude-plugin/plugin.json
deleted file mode 100644
index edd9df2..0000000
--- a/github/.claude-plugin/plugin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "github",
-  "description": "Collection of claude commands to interact with github issues, PRs and more",
-  "version": "1.0.0",
-  "author": {
-    "name": "Juan Puelpan"
-  }
-}