diff --git a/Demos.md b/Demos.md
index 7487b25..0090966 100644
--- a/Demos.md
+++ b/Demos.md
@@ -4,17 +4,17 @@ Demos are included in `/demo`:
 
 - `index.html` & `index.js`: [browser]  
   Main browser demo app that showcases all Human capabilities
-- `facematch.html` & `facematch.js`: [browser]  
+- `facematch`: [browser]  
   Extracts faces from images, calculates face descriptors calculates simmilarities
-- `face3d.html` & `face3d.js`: [browser]  
+- `face3d`: [browser]  
   3D render of face mesh using `Three.js`
-- `node.js`: [nodejs]  
+- `nodejs/node`: [nodejs]  
   Process images from files or URLs
-- `node-multiprocess` & `node-multiprocess-worker`: [nodejs]  
+- `nodejs/node-multiprocess` & `nodejs/node-multiprocess-worker`: [nodejs]  
   Parallel processing in multiple child worker processes
-- `node-video`: [nodejs]  
+- `nodejs/node-video`: [nodejs]  
   Processing of video input using `ffmpeg`
-- `node-webcam`: [nodejs]  
+- `nodejs/node-webcam`: [nodejs]  
   Processing of webcam screenshots using `fswebcam`
 
 <br><hr><br>
@@ -110,13 +110,13 @@ For example:
 
 ## Face 3D Rendering using OpenGL
 
-- `face3d.html`: Demo for Browsers that uses `Three.js` for 3D OpenGL rendering of a detected face
+- `face3d`: Demo for Browsers that uses `Three.js` for 3D OpenGL rendering of a detected face
 
 <br><hr><br>
 
 ## Face Recognition Demo
 
-- `demo/facematch.html`: Demo for Browsers that uses all face description and embedding features to  
+- `demo/facematch`: Demo for Browsers that uses all face description and embedding features to  
 detect, extract and identify all faces plus calculate simmilarity between them
 
 It highlights functionality such as:
@@ -131,14 +131,14 @@ It highlights functionality such as:
 
 ## NodeJS Demo
 
-- `node.js`: Demo using NodeJS with CommonJS module  
+- `nodejs/node.js`: Demo using NodeJS with CommonJS module  
   Simple demo that can process any input image
 
 Note that you can run demo as-is and it will perform detection on provided sample images,  
 or you can pass a path to image to analyze, either on local filesystem or using URL
 
 ```shell
-node demo/node.js
+node demo/nodejs/node.js
 ```
 
 ```json
@@ -236,11 +236,11 @@ node demo/node.js
 
 ## NodeJS Multi-process Demo
 
-- `node-multiprocess.js` and `node-multiprocess-worker.js`: Demo using NodeJS with CommonJS module  
+- `nodejs/node-multiprocess.js` and `nodejs/node-multiprocess-worker.js`: Demo using NodeJS with CommonJS module  
   Demo that starts n child worker processes for parallel execution
 
 ```shell
-node node-multiprocess.js
+node demo/nodejs/node-multiprocess.js
 ```
 
 ```json
@@ -300,10 +300,10 @@ node node-multiprocess.js
 
 ## NodeJS Demo for Video Input Processing
 
-- `node-video.js`: Demo that uses `ffmpeg` to decode video input (can be a file, stream or device such as webcam) and output results in a pipe that are captured by demo app as frames and processed by Human library
+- `nodejs/node-video.js`: Demo that uses `ffmpeg` to decode video input (can be a file, stream or device such as webcam) and output results in a pipe that are captured by demo app as frames and processed by Human library
 
 <br><hr><br>
 
 ## NodeJS Demo for WebCam Screenshot Processing
 
-- `node-webcam.js`: Demo that uses `fswebcam` to connect to web cam and take screenshots at regular interval which are then processed by Human library
+- `nodejs/node-webcam.js`: Demo that uses `fswebcam` to connect to web cam and take screenshots at regular interval which are then processed by Human library
diff --git a/Embedding.md b/Embedding.md
index a508400..7254502 100644
--- a/Embedding.md
+++ b/Embedding.md
@@ -128,11 +128,11 @@ Last parameter is optional and notes a minimal threshold for a match
 
 Database can be further stored in a JS or JSON file and retrieved when needed to have  
 a permanent database of faces that can be expanded over time to cover any number of known faces  
-For example, see `/demo/facematch.js` and example database `/demo/facematch-faces.json`:
+For example, see `/demo/facematch/facematch.js` and example database `/demo/facematch/faces.json`:
 
 ```js
   // download db with known faces
-  let res = await fetch('/demo/facematch-faces.json');
+  let res = await fetch('/demo/facematch/faces.json');
   db = (res && res.ok) ? await res.json() : [];
 ```
 
@@ -158,4 +158,4 @@ To achieve optimal result, `Human` performs following operations on an image bef
 extracts all faces from them, processed them and then allows  
 for a selection of any face which sorts faces by similarity
 
-Demo is available in `demo/facematch.html` which uses `demo/facematch.js` as JavaSript module
+Demo is available in `demo/facematch` which uses `facematch.js` as JavaSript module
diff --git a/Home.md b/Home.md
index 55b8709..3cc17f2 100644
--- a/Home.md
+++ b/Home.md
@@ -23,8 +23,8 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) fo
 ## Demos
 
 - [**Main Application**](https://vladmandic.github.io/human/demo/index.html)
-- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch.html)
-- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d.html)
+- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch/index.html)
+- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d/index.html)
 - [**Details on Demo Applications**](https://github.com/vladmandic/human/wiki/Demos)
 
 ## Project pages