diff --git a/.agents/skills/add-to-release-please/SKILL.md b/.agents/skills/add-to-release-please/SKILL.md
index a3a36dd3..9e7416b4 100644
--- a/.agents/skills/add-to-release-please/SKILL.md
+++ b/.agents/skills/add-to-release-please/SKILL.md
@@ -29,7 +29,7 @@ The path is the package key in both config files (repo-relative directory). Conf
 
 | Kind | Path examples |
 |---|---|
-| App | `cogstack-cohorter` |
+| App | `apps/cogstack-cohorter` |
 | Helm chart | `helm-charts/medcat-service-helm` |
 
 Helm charts in this repo are top-level directories under `helm-charts/<chart>/` with a `Chart.yaml`. The package key is that directory. See [Helm charts](#helm-charts) before editing.
diff --git a/.github/workflows/cogstack-cohorter-docker.yml b/.github/workflows/cogstack-cohorter-docker.yml
index 1e76e65f..0c5d3030 100644
--- a/.github/workflows/cogstack-cohorter-docker.yml
+++ b/.github/workflows/cogstack-cohorter-docker.yml
@@ -6,11 +6,11 @@ on:
     tags:
       - "cohorter-v*.*.*" # e.g., cohorter-v1.2.3
     paths:
-      - "cogstack-cohorter/**"
+      - "apps/cogstack-cohorter/**"
       - ".github/workflows/cogstack-cohorter-docker**"
   pull_request:
     paths:
-      - "cogstack-cohorter/**"
+      - "apps/cogstack-cohorter/**"
       - ".github/workflows/cogstack-cohorter-docker**"
 
 jobs:
@@ -24,13 +24,13 @@ jobs:
       matrix:
         include:
           - name: nl2dsl
-            context: cogstack-cohorter/NL2DSL
-            dockerfile: cogstack-cohorter/NL2DSL/Dockerfile
+            context: apps/cogstack-cohorter/NL2DSL
+            dockerfile: apps/cogstack-cohorter/NL2DSL/Dockerfile
             image: cogstacksystems/cogstack-cohorter-nl2dsl
 
           - name: webapp
-            context: cogstack-cohorter/WebAPP
-            dockerfile: cogstack-cohorter/WebAPP/Dockerfile
+            context: apps/cogstack-cohorter/WebAPP
+            dockerfile: apps/cogstack-cohorter/WebAPP/Dockerfile
             image: cogstacksystems/cogstack-cohorter-webapp
 
     steps:
diff --git a/README.md b/README.md
index 22c4de98..ef3b2422 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ See the latest documentation on [Readthedocs](https://docs.cogstack.org/en/lates
   </tr>
   <tr>
     <td align="center" valign="top" width="50%">
-      <a href="cogstack-cohorter">
+      <a href="apps/cogstack-cohorter">
         <img src="docs/docs/assets/cogstack-logo.png" alt="CogStack Cohorter" height="56"/>
         <br/><strong>CogStack Cohorter</strong>
       </a>
diff --git a/cogstack-cohorter/.env.example b/apps/cogstack-cohorter/.env.example
similarity index 100%
rename from cogstack-cohorter/.env.example
rename to apps/cogstack-cohorter/.env.example
diff --git a/cogstack-cohorter/.gitignore b/apps/cogstack-cohorter/.gitignore
similarity index 100%
rename from cogstack-cohorter/.gitignore
rename to apps/cogstack-cohorter/.gitignore
diff --git a/cogstack-cohorter/NL2DSL/.dockerignore b/apps/cogstack-cohorter/NL2DSL/.dockerignore
similarity index 100%
rename from cogstack-cohorter/NL2DSL/.dockerignore
rename to apps/cogstack-cohorter/NL2DSL/.dockerignore
diff --git a/cogstack-cohorter/NL2DSL/.gitignore b/apps/cogstack-cohorter/NL2DSL/.gitignore
similarity index 100%
rename from cogstack-cohorter/NL2DSL/.gitignore
rename to apps/cogstack-cohorter/NL2DSL/.gitignore
diff --git a/cogstack-cohorter/NL2DSL/Dockerfile b/apps/cogstack-cohorter/NL2DSL/Dockerfile
similarity index 100%
rename from cogstack-cohorter/NL2DSL/Dockerfile
rename to apps/cogstack-cohorter/NL2DSL/Dockerfile
diff --git a/cogstack-cohorter/NL2DSL/README.md b/apps/cogstack-cohorter/NL2DSL/README.md
similarity index 100%
rename from cogstack-cohorter/NL2DSL/README.md
rename to apps/cogstack-cohorter/NL2DSL/README.md
diff --git a/cogstack-cohorter/NL2DSL/docker_build.sh b/apps/cogstack-cohorter/NL2DSL/docker_build.sh
similarity index 100%
rename from cogstack-cohorter/NL2DSL/docker_build.sh
rename to apps/cogstack-cohorter/NL2DSL/docker_build.sh
diff --git a/cogstack-cohorter/NL2DSL/docker_run.sh b/apps/cogstack-cohorter/NL2DSL/docker_run.sh
similarity index 100%
rename from cogstack-cohorter/NL2DSL/docker_run.sh
rename to apps/cogstack-cohorter/NL2DSL/docker_run.sh
diff --git a/cogstack-cohorter/NL2DSL/package-lock.json b/apps/cogstack-cohorter/NL2DSL/package-lock.json
similarity index 100%
rename from cogstack-cohorter/NL2DSL/package-lock.json
rename to apps/cogstack-cohorter/NL2DSL/package-lock.json
diff --git a/cogstack-cohorter/NL2DSL/package.json b/apps/cogstack-cohorter/NL2DSL/package.json
similarity index 100%
rename from cogstack-cohorter/NL2DSL/package.json
rename to apps/cogstack-cohorter/NL2DSL/package.json
diff --git a/cogstack-cohorter/NL2DSL/public/index.html b/apps/cogstack-cohorter/NL2DSL/public/index.html
similarity index 100%
rename from cogstack-cohorter/NL2DSL/public/index.html
rename to apps/cogstack-cohorter/NL2DSL/public/index.html
diff --git a/cogstack-cohorter/NL2DSL/server.js b/apps/cogstack-cohorter/NL2DSL/server.js
similarity index 100%
rename from cogstack-cohorter/NL2DSL/server.js
rename to apps/cogstack-cohorter/NL2DSL/server.js
diff --git a/cogstack-cohorter/README.md b/apps/cogstack-cohorter/README.md
similarity index 99%
rename from cogstack-cohorter/README.md
rename to apps/cogstack-cohorter/README.md
index 7b58aa0c..b46ed4f2 100644
--- a/cogstack-cohorter/README.md
+++ b/apps/cogstack-cohorter/README.md
@@ -27,7 +27,7 @@ A lightweight cohort discovery application that combines:
 - (Optional) GPU setup if you want Ollama GPU acceleration (depends on your host OS)
 
 ### 1) Build and start all services
-From the repo root:
+From this directory:
 
 ```bash
 docker compose up --build
diff --git a/cogstack-cohorter/WebAPP/.dockerignore b/apps/cogstack-cohorter/WebAPP/.dockerignore
similarity index 100%
rename from cogstack-cohorter/WebAPP/.dockerignore
rename to apps/cogstack-cohorter/WebAPP/.dockerignore
diff --git a/cogstack-cohorter/WebAPP/.gitignore b/apps/cogstack-cohorter/WebAPP/.gitignore
similarity index 100%
rename from cogstack-cohorter/WebAPP/.gitignore
rename to apps/cogstack-cohorter/WebAPP/.gitignore
diff --git a/cogstack-cohorter/WebAPP/Dockerfile b/apps/cogstack-cohorter/WebAPP/Dockerfile
similarity index 100%
rename from cogstack-cohorter/WebAPP/Dockerfile
rename to apps/cogstack-cohorter/WebAPP/Dockerfile
diff --git a/cogstack-cohorter/WebAPP/LICENSE b/apps/cogstack-cohorter/WebAPP/LICENSE
similarity index 100%
rename from cogstack-cohorter/WebAPP/LICENSE
rename to apps/cogstack-cohorter/WebAPP/LICENSE
diff --git a/cogstack-cohorter/WebAPP/README.md b/apps/cogstack-cohorter/WebAPP/README.md
similarity index 96%
rename from cogstack-cohorter/WebAPP/README.md
rename to apps/cogstack-cohorter/WebAPP/README.md
index 20f1b525..17a4c2c5 100644
--- a/cogstack-cohorter/WebAPP/README.md
+++ b/apps/cogstack-cohorter/WebAPP/README.md
@@ -8,7 +8,7 @@ This webapp is a cohort app for users to obtain the number of patients satifying
 
 Other runtime dependencies include [ECharts](https://echarts.apache.org/en/index.html) for charts and [popper.js](https://popper.js.org/) for tooltips.
 
-A GitHub Packages token with `read:packages` scope is required to install `@cogstack/frontend-common-react`. Set it in a `.env` file at the `cogstack-cohorter/` root (see `.env.example`) or export it in your shell:
+A GitHub Packages token with `read:packages` scope is required to install `@cogstack/frontend-common-react`. Set it in a `.env` file at the `apps/cogstack-cohorter/` root (see `.env.example`) or export it in your shell:
 
 ```bash
 export NPM_TOKEN=ghp_your_token_here
@@ -44,7 +44,7 @@ There is a script `gen_random_data.js` in `server/data/` folder to generate the
 
 Please make sure to have the six data files ready in the `server/data/` folder before starting the server. To start the server, in the app folder run `cd server && npm install && npm run start`. 
 
-The recommended way to run the full stack (webapp + NL2DSL + MedCAT + Ollama) is via `docker-compose` from the `cogstack-cohorter/` root — see the root-level README and `.env.example` for details. The `NPM_TOKEN` is passed as a BuildKit secret; set it in the `.env` file before building.
+The recommended way to run the full stack (webapp + NL2DSL + MedCAT + Ollama) is via `docker-compose` from the `apps/cogstack-cohorter/` root — see the root-level README and `.env.example` for details. The `NPM_TOKEN` is passed as a BuildKit secret; set it in the `.env` file before building.
 
 ### Environment variables
 
@@ -92,7 +92,7 @@ In Kubernetes these are set as env vars on the webapp container (via helm `cogst
 
 ### Run using Docker with random data
 
-Set `RANDOM_DATA=true` in your `.env` file (or leave it unset — it defaults to `true`), then from the `cogstack-cohorter/` root:
+Set `RANDOM_DATA=true` in your `.env` file (or leave it unset — it defaults to `true`), then from the `apps/cogstack-cohorter/` root:
 
 ```bash
 docker compose up --build
diff --git a/cogstack-cohorter/WebAPP/client-react/README.md b/apps/cogstack-cohorter/WebAPP/client-react/README.md
similarity index 96%
rename from cogstack-cohorter/WebAPP/client-react/README.md
rename to apps/cogstack-cohorter/WebAPP/client-react/README.md
index 3f5b07f2..bf412ae7 100644
--- a/cogstack-cohorter/WebAPP/client-react/README.md
+++ b/apps/cogstack-cohorter/WebAPP/client-react/README.md
@@ -21,7 +21,7 @@ It keeps the existing Alpine-style template/data model behaviour, while using Re
 
 ## Environment variables
 
-A single `.env` file at the **`cogstack-cohorter/` root** (one level up from `WebAPP/`) is shared between Vite and `docker-compose`. Copy `.env.example` there and fill in values:
+A single `.env` file at the **`apps/cogstack-cohorter/` root** (one level up from `WebAPP/`) is shared between Vite and `docker-compose`. Copy `.env.example` there and fill in values:
 
 ```bash
 cp ../../.env.example ../../.env
diff --git a/cogstack-cohorter/WebAPP/client-react/index.html b/apps/cogstack-cohorter/WebAPP/client-react/index.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/index.html
rename to apps/cogstack-cohorter/WebAPP/client-react/index.html
diff --git a/cogstack-cohorter/WebAPP/client-react/package-lock.json b/apps/cogstack-cohorter/WebAPP/client-react/package-lock.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/package-lock.json
rename to apps/cogstack-cohorter/WebAPP/client-react/package-lock.json
diff --git a/cogstack-cohorter/WebAPP/client-react/package.json b/apps/cogstack-cohorter/WebAPP/client-react/package.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/package.json
rename to apps/cogstack-cohorter/WebAPP/client-react/package.json
diff --git a/cogstack-cohorter/WebAPP/client-react/postcss.config.js b/apps/cogstack-cohorter/WebAPP/client-react/postcss.config.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/postcss.config.js
rename to apps/cogstack-cohorter/WebAPP/client-react/postcss.config.js
diff --git a/cogstack-cohorter/WebAPP/client-react/public/app-template.html b/apps/cogstack-cohorter/WebAPP/client-react/public/app-template.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/app-template.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/app-template.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo-Landcape-Dark.svg b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo-Landcape-Dark.svg
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo-Landcape-Dark.svg
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo-Landcape-Dark.svg
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo.svg b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo.svg
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo.svg
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/Cogstack-Logo.svg
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/css/google.fonts.css b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/google.fonts.css
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/css/google.fonts.css
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/google.fonts.css
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.css b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.css
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.css
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.css
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.output.css b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.output.css
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.output.css
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/css/tailwind.output.css
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/js/alpine.3.10.5.js b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/alpine.3.10.5.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/js/alpine.3.10.5.js
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/alpine.3.10.5.js
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/js/echarts.min.js b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/echarts.min.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/js/echarts.min.js
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/echarts.min.js
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/js/init-alpine.js b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/init-alpine.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/js/init-alpine.js
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/init-alpine.js
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js
diff --git a/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js.map b/apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js.map
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js.map
rename to apps/cogstack-cohorter/WebAPP/client-react/public/assets/js/popper.min.js.map
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/busy-pill.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/busy-pill.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/busy-pill.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/busy-pill.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/query-nl.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/query-nl.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/query-nl.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/query-nl.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/query-v1.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/query-v1.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/query-v1.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/query-v1.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/results-main.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/results-main.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/results-main.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/results-main.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-desktop.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-desktop.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/sidebar-desktop.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-desktop.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-mobile.html b/apps/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-mobile.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/components/sidebar-mobile.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/components/sidebar-mobile.html
diff --git a/cogstack-cohorter/WebAPP/client-react/public/index.html b/apps/cogstack-cohorter/WebAPP/client-react/public/index.html
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/public/index.html
rename to apps/cogstack-cohorter/WebAPP/client-react/public/index.html
diff --git a/cogstack-cohorter/WebAPP/client-react/src/AdminLoginDialog.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/AdminLoginDialog.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/AdminLoginDialog.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/AdminLoginDialog.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/App.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/App.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/App.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/App.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/FilterSidebar.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/FilterSidebar.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/FilterSidebar.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/FilterSidebar.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/HeaderControls.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/HeaderControls.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/HeaderControls.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/HeaderControls.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/LoadQueryDialog.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/LoadQueryDialog.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/LoadQueryDialog.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/LoadQueryDialog.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/alpine-data.js b/apps/cogstack-cohorter/WebAPP/client-react/src/alpine-data.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/alpine-data.js
rename to apps/cogstack-cohorter/WebAPP/client-react/src/alpine-data.js
diff --git a/cogstack-cohorter/WebAPP/client-react/src/alpine-runtime.js b/apps/cogstack-cohorter/WebAPP/client-react/src/alpine-runtime.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/alpine-runtime.js
rename to apps/cogstack-cohorter/WebAPP/client-react/src/alpine-runtime.js
diff --git a/cogstack-cohorter/WebAPP/client-react/src/index.css b/apps/cogstack-cohorter/WebAPP/client-react/src/index.css
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/index.css
rename to apps/cogstack-cohorter/WebAPP/client-react/src/index.css
diff --git a/cogstack-cohorter/WebAPP/client-react/src/main.jsx b/apps/cogstack-cohorter/WebAPP/client-react/src/main.jsx
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/main.jsx
rename to apps/cogstack-cohorter/WebAPP/client-react/src/main.jsx
diff --git a/cogstack-cohorter/WebAPP/client-react/src/template-components.js b/apps/cogstack-cohorter/WebAPP/client-react/src/template-components.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/src/template-components.js
rename to apps/cogstack-cohorter/WebAPP/client-react/src/template-components.js
diff --git a/cogstack-cohorter/WebAPP/client-react/tailwind.config.js b/apps/cogstack-cohorter/WebAPP/client-react/tailwind.config.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/client-react/tailwind.config.js
rename to apps/cogstack-cohorter/WebAPP/client-react/tailwind.config.js
diff --git a/cogstack-cohorter/WebAPP/client-react/vite.config.js b/apps/cogstack-cohorter/WebAPP/client-react/vite.config.js
similarity index 94%
rename from cogstack-cohorter/WebAPP/client-react/vite.config.js
rename to apps/cogstack-cohorter/WebAPP/client-react/vite.config.js
index 1b178198..b6fe8cc7 100644
--- a/cogstack-cohorter/WebAPP/client-react/vite.config.js
+++ b/apps/cogstack-cohorter/WebAPP/client-react/vite.config.js
@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';
 // Express server port (same origin in production; proxied in dev)
 const API_ORIGIN = 'http://localhost:3000';
 
-// Point Vite at the cogstack-cohorter/ root so that it reads the same .env
+// Point Vite at the apps/cogstack-cohorter/ root so that it reads the same .env
 // as docker-compose, eliminating the need for a separate client-react/.env.
 // Both `npm run dev` (Vite) and `docker-compose build` resolve vars from one file.
 const ENV_DIR = '../../';
diff --git a/cogstack-cohorter/WebAPP/docker_build.sh b/apps/cogstack-cohorter/WebAPP/docker_build.sh
similarity index 100%
rename from cogstack-cohorter/WebAPP/docker_build.sh
rename to apps/cogstack-cohorter/WebAPP/docker_build.sh
diff --git a/cogstack-cohorter/WebAPP/docker_run.sh b/apps/cogstack-cohorter/WebAPP/docker_run.sh
similarity index 100%
rename from cogstack-cohorter/WebAPP/docker_run.sh
rename to apps/cogstack-cohorter/WebAPP/docker_run.sh
diff --git a/cogstack-cohorter/WebAPP/entrypoint.sh b/apps/cogstack-cohorter/WebAPP/entrypoint.sh
similarity index 100%
rename from cogstack-cohorter/WebAPP/entrypoint.sh
rename to apps/cogstack-cohorter/WebAPP/entrypoint.sh
diff --git a/cogstack-cohorter/WebAPP/server/data-example/cui_pt2ch_example.json b/apps/cogstack-cohorter/WebAPP/server/data-example/cui_pt2ch_example.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/data-example/cui_pt2ch_example.json
rename to apps/cogstack-cohorter/WebAPP/server/data-example/cui_pt2ch_example.json
diff --git a/cogstack-cohorter/WebAPP/server/data-example/snomed_example.json b/apps/cogstack-cohorter/WebAPP/server/data-example/snomed_example.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/data-example/snomed_example.json
rename to apps/cogstack-cohorter/WebAPP/server/data-example/snomed_example.json
diff --git a/cogstack-cohorter/WebAPP/server/gen_random_data.js b/apps/cogstack-cohorter/WebAPP/server/gen_random_data.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/gen_random_data.js
rename to apps/cogstack-cohorter/WebAPP/server/gen_random_data.js
diff --git a/cogstack-cohorter/WebAPP/server/package-lock.json b/apps/cogstack-cohorter/WebAPP/server/package-lock.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/package-lock.json
rename to apps/cogstack-cohorter/WebAPP/server/package-lock.json
diff --git a/cogstack-cohorter/WebAPP/server/package.json b/apps/cogstack-cohorter/WebAPP/server/package.json
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/package.json
rename to apps/cogstack-cohorter/WebAPP/server/package.json
diff --git a/cogstack-cohorter/WebAPP/server/server.js b/apps/cogstack-cohorter/WebAPP/server/server.js
similarity index 100%
rename from cogstack-cohorter/WebAPP/server/server.js
rename to apps/cogstack-cohorter/WebAPP/server/server.js
diff --git a/cogstack-cohorter/cohorter.gif b/apps/cogstack-cohorter/cohorter.gif
similarity index 100%
rename from cogstack-cohorter/cohorter.gif
rename to apps/cogstack-cohorter/cohorter.gif
diff --git a/cogstack-cohorter/docker-compose.yml b/apps/cogstack-cohorter/docker-compose.yml
similarity index 100%
rename from cogstack-cohorter/docker-compose.yml
rename to apps/cogstack-cohorter/docker-compose.yml