diff --git a/.agents/plugins/marketplace.json b/.agents/plugins/marketplace.json
new file mode 100644
index 0000000..bd36fe0
--- /dev/null
+++ b/.agents/plugins/marketplace.json
@@ -0,0 +1,20 @@
+{
+  "name": "apify-plugins",
+  "interface": {
+    "displayName": "Apify Plugin"
+  },
+  "plugins": [
+    {
+      "name": "apify",
+      "source": {
+        "source": "local",
+        "path": "./apify"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity"
+    }
+  ]
+}
diff --git a/.codex-plugin/plugin.json b/apify/.codex-plugin/plugin.json
similarity index 96%
rename from .codex-plugin/plugin.json
rename to apify/.codex-plugin/plugin.json
index b656ade..65b9be7 100644
--- a/.codex-plugin/plugin.json
+++ b/apify/.codex-plugin/plugin.json
@@ -22,7 +22,7 @@
     "websiteURL": "https://apify.com",
     "privacyPolicyURL": "https://apify.com/privacy-policy",
     "termsOfServiceURL": "https://apify.com/terms-of-use",
-    "composerIcon": "./assets/icon.svg",
+    "composerIcon": "./assets/logo.svg",
     "logo": "./assets/logo.svg"
   }
 }
diff --git a/.mcp.json b/apify/.mcp.json
similarity index 100%
rename from .mcp.json
rename to apify/.mcp.json
diff --git a/assets/logo.svg b/apify/assets/logo.svg
similarity index 100%
rename from assets/logo.svg
rename to apify/assets/logo.svg
diff --git a/skills/apify-actor-development/SKILL.md b/apify/skills/apify-actor-development/SKILL.md
similarity index 100%
rename from skills/apify-actor-development/SKILL.md
rename to apify/skills/apify-actor-development/SKILL.md
diff --git a/skills/apify-actor-development/references/actor-json.md b/apify/skills/apify-actor-development/references/actor-json.md
similarity index 100%
rename from skills/apify-actor-development/references/actor-json.md
rename to apify/skills/apify-actor-development/references/actor-json.md
diff --git a/skills/apify-actor-development/references/actor-readme.md b/apify/skills/apify-actor-development/references/actor-readme.md
similarity index 100%
rename from skills/apify-actor-development/references/actor-readme.md
rename to apify/skills/apify-actor-development/references/actor-readme.md
diff --git a/skills/apify-actor-development/references/dataset-schema.md b/apify/skills/apify-actor-development/references/dataset-schema.md
similarity index 100%
rename from skills/apify-actor-development/references/dataset-schema.md
rename to apify/skills/apify-actor-development/references/dataset-schema.md
diff --git a/skills/apify-actor-development/references/input-schema.md b/apify/skills/apify-actor-development/references/input-schema.md
similarity index 100%
rename from skills/apify-actor-development/references/input-schema.md
rename to apify/skills/apify-actor-development/references/input-schema.md
diff --git a/skills/apify-actor-development/references/key-value-store-schema.md b/apify/skills/apify-actor-development/references/key-value-store-schema.md
similarity index 100%
rename from skills/apify-actor-development/references/key-value-store-schema.md
rename to apify/skills/apify-actor-development/references/key-value-store-schema.md
diff --git a/skills/apify-actor-development/references/logging.md b/apify/skills/apify-actor-development/references/logging.md
similarity index 100%
rename from skills/apify-actor-development/references/logging.md
rename to apify/skills/apify-actor-development/references/logging.md
diff --git a/skills/apify-actor-development/references/output-schema.md b/apify/skills/apify-actor-development/references/output-schema.md
similarity index 100%
rename from skills/apify-actor-development/references/output-schema.md
rename to apify/skills/apify-actor-development/references/output-schema.md
diff --git a/skills/apify-actor-development/references/standby-mode.md b/apify/skills/apify-actor-development/references/standby-mode.md
similarity index 100%
rename from skills/apify-actor-development/references/standby-mode.md
rename to apify/skills/apify-actor-development/references/standby-mode.md
diff --git a/skills/apify-actorization/SKILL.md b/apify/skills/apify-actorization/SKILL.md
similarity index 100%
rename from skills/apify-actorization/SKILL.md
rename to apify/skills/apify-actorization/SKILL.md
diff --git a/skills/apify-actorization/references/cli-actorization.md b/apify/skills/apify-actorization/references/cli-actorization.md
similarity index 100%
rename from skills/apify-actorization/references/cli-actorization.md
rename to apify/skills/apify-actorization/references/cli-actorization.md
diff --git a/skills/apify-actorization/references/js-ts-actorization.md b/apify/skills/apify-actorization/references/js-ts-actorization.md
similarity index 100%
rename from skills/apify-actorization/references/js-ts-actorization.md
rename to apify/skills/apify-actorization/references/js-ts-actorization.md
diff --git a/skills/apify-actorization/references/python-actorization.md b/apify/skills/apify-actorization/references/python-actorization.md
similarity index 100%
rename from skills/apify-actorization/references/python-actorization.md
rename to apify/skills/apify-actorization/references/python-actorization.md
diff --git a/skills/apify-actorization/references/schemas-and-output.md b/apify/skills/apify-actorization/references/schemas-and-output.md
similarity index 100%
rename from skills/apify-actorization/references/schemas-and-output.md
rename to apify/skills/apify-actorization/references/schemas-and-output.md
diff --git a/skills/apify-generate-output-schema/SKILL.md b/apify/skills/apify-generate-output-schema/SKILL.md
similarity index 100%
rename from skills/apify-generate-output-schema/SKILL.md
rename to apify/skills/apify-generate-output-schema/SKILL.md
diff --git a/skills/apify-sdk-integration/SKILL.md b/apify/skills/apify-sdk-integration/SKILL.md
similarity index 100%
rename from skills/apify-sdk-integration/SKILL.md
rename to apify/skills/apify-sdk-integration/SKILL.md
diff --git a/skills/apify-ultimate-scraper/SKILL.md b/apify/skills/apify-ultimate-scraper/SKILL.md
similarity index 100%
rename from skills/apify-ultimate-scraper/SKILL.md
rename to apify/skills/apify-ultimate-scraper/SKILL.md
diff --git a/skills/apify-ultimate-scraper/references/actor-index.md b/apify/skills/apify-ultimate-scraper/references/actor-index.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/actor-index.md
rename to apify/skills/apify-ultimate-scraper/references/actor-index.md
diff --git a/skills/apify-ultimate-scraper/references/gotchas.md b/apify/skills/apify-ultimate-scraper/references/gotchas.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/gotchas.md
rename to apify/skills/apify-ultimate-scraper/references/gotchas.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/brand-monitoring.md b/apify/skills/apify-ultimate-scraper/references/workflows/brand-monitoring.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/brand-monitoring.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/brand-monitoring.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/company-research.md b/apify/skills/apify-ultimate-scraper/references/workflows/company-research.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/company-research.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/company-research.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/competitive-intel.md b/apify/skills/apify-ultimate-scraper/references/workflows/competitive-intel.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/competitive-intel.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/competitive-intel.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/contact-enrichment.md b/apify/skills/apify-ultimate-scraper/references/workflows/contact-enrichment.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/contact-enrichment.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/contact-enrichment.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/content-and-seo.md b/apify/skills/apify-ultimate-scraper/references/workflows/content-and-seo.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/content-and-seo.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/content-and-seo.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/ecommerce-price-monitoring.md b/apify/skills/apify-ultimate-scraper/references/workflows/ecommerce-price-monitoring.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/ecommerce-price-monitoring.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/ecommerce-price-monitoring.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/influencer-vetting.md b/apify/skills/apify-ultimate-scraper/references/workflows/influencer-vetting.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/influencer-vetting.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/influencer-vetting.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/job-market-and-recruitment.md b/apify/skills/apify-ultimate-scraper/references/workflows/job-market-and-recruitment.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/job-market-and-recruitment.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/job-market-and-recruitment.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/knowledge-base-and-rag.md b/apify/skills/apify-ultimate-scraper/references/workflows/knowledge-base-and-rag.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/knowledge-base-and-rag.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/knowledge-base-and-rag.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/lead-generation.md b/apify/skills/apify-ultimate-scraper/references/workflows/lead-generation.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/lead-generation.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/lead-generation.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/real-estate-and-hospitality.md b/apify/skills/apify-ultimate-scraper/references/workflows/real-estate-and-hospitality.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/real-estate-and-hospitality.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/real-estate-and-hospitality.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/review-analysis.md b/apify/skills/apify-ultimate-scraper/references/workflows/review-analysis.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/review-analysis.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/review-analysis.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/social-media-analytics.md b/apify/skills/apify-ultimate-scraper/references/workflows/social-media-analytics.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/social-media-analytics.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/social-media-analytics.md
diff --git a/skills/apify-ultimate-scraper/references/workflows/trend-research.md b/apify/skills/apify-ultimate-scraper/references/workflows/trend-research.md
similarity index 100%
rename from skills/apify-ultimate-scraper/references/workflows/trend-research.md
rename to apify/skills/apify-ultimate-scraper/references/workflows/trend-research.md