diff --git a/projects-old/mCaptcha/default.nix b/projects-old/mCaptcha/default.nix
deleted file mode 100644
index b580f4cc2..000000000
--- a/projects-old/mCaptcha/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  pkgs,
-  lib,
-  sources,
-}@args:
-{
-  packages = { inherit (pkgs) mcaptcha mcaptcha-cache; };
-  nixos = {
-    modules.services.mcaptcha = ./service.nix;
-    tests = {
-      create-locally = import ./tests/create-locally.nix args;
-      bring-your-own-services = import ./tests/bring-your-own-services.nix args;
-    };
-    examples = null;
-  };
-}
diff --git a/projects/mCaptcha/default.nix b/projects/mCaptcha/default.nix
new file mode 100644
index 000000000..b86d709db
--- /dev/null
+++ b/projects/mCaptcha/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  pkgs,
+  sources,
+}@args:
+
+{
+  metadata = {
+    summary = "Privacy-friendly Proof of Work (PoW) based CAPTCHA system";
+    subgrants = [
+      "mCaptcha"
+    ];
+    links = {
+      website = {
+        text = "Official website";
+        url = "https://mcaptcha.org/";
+      };
+      documentation = {
+        text = "Official documentation";
+        url = "https://mcaptcha.org/docs/";
+      };
+    };
+  };
+
+  nixos.modules.services = {
+    mcaptcha = {
+      name = "mcaptcha";
+      module = ./services/mcaptcha/module.nix;
+      examples.basic = null;
+      links = {
+        setup = {
+          text = "Development setup";
+          url = "https://github.com/mCaptcha/mCaptcha/blob/master/docs/HACKING.md";
+        };
+        deployment = {
+          text = "Deployment instructions";
+          url = "https://github.com/mCaptcha/mCaptcha/blob/master/docs/DEPLOYMENT.md";
+        };
+        configuration = {
+          text = "Configuration instructions";
+          url = "https://github.com/mCaptcha/mCaptcha/blob/master/docs/CONFIGURATION.md";
+        };
+      };
+    };
+  };
+
+  nixos.tests.bring-your-own-services = import ./services/mcaptcha/tests/bring-your-own-services.nix args;
+  nixos.tests.create-locally = import ./services/mcaptcha/tests/create-locally.nix args;
+}
diff --git a/projects-old/mCaptcha/service.nix b/projects/mCaptcha/services/mcaptcha/module.nix
similarity index 100%
rename from projects-old/mCaptcha/service.nix
rename to projects/mCaptcha/services/mcaptcha/module.nix
diff --git a/projects-old/mCaptcha/tests/bring-your-own-services.nix b/projects/mCaptcha/services/mcaptcha/tests/bring-your-own-services.nix
similarity index 100%
rename from projects-old/mCaptcha/tests/bring-your-own-services.nix
rename to projects/mCaptcha/services/mcaptcha/tests/bring-your-own-services.nix
diff --git a/projects-old/mCaptcha/tests/create-locally.nix b/projects/mCaptcha/services/mcaptcha/tests/create-locally.nix
similarity index 100%
rename from projects-old/mCaptcha/tests/create-locally.nix
rename to projects/mCaptcha/services/mcaptcha/tests/create-locally.nix