diff --git a/README.md b/README.md
index f76e1f1..81f814b 100644
--- a/README.md
+++ b/README.md
@@ -14,40 +14,40 @@ Current demos:
 
 + **SDK**
   + *MCU MODULES*
-    + *GPIO*
-      + [DIGITAL INPUT/OUTPUT](./demos/sdk/demodigitalinputoutput/project/resources/details.md)
-      + [LED BLINKING](./demos/sdk/demoledblinking/project/resources/details.md)
-      + [LED CURTAIN](./demos/sdk/demoledcurtain/project/resources/details.md)
-      + [PORT BLINKING](./demos/sdk/demoport/project/resources/details.md)
-    + *ADC*
-      + [ANALOG IN CONVERSION](./demos/sdk/demoanalogin/project/resources/details.md)
-    + *I2C*
-      + [I2C WRITE READ](./demos/sdk/demoi2c/project/resources/details.md)
-    + *PWM*
-      + [PWM LED BLINKING](./demos/sdk/demopwm/project/resources/details.md)
-    + *SPI*
-      + [SPI WRITE READ](./demos/sdk/demospi/project/resources/details.md)
-    + *UART*
-      + [UART ECHO](./demos/sdk/demouart/project/resources/details.md)
-    + *CAN*
-      + [LOOPBACK](./demos/sdk/democanloopback/project/resources/details.md)
-      + [RECEIVE](./demos/sdk/democanreceive/project/resources/details.md)
-      + [TRANSMIT](./demos/sdk/democantransmit/project/resources/details.md)
-    + *ETHERNET*
-      + [CYCLONE TCP ECHO SERVER](./demos/sdk/democyclonetcpechoserver/project/resources/details.md)
-      + [CYCLONE TCP FTP CLIENT](./demos/sdk/democyclonetcpftpclient/project/resources/details.md)
-      + [CYCLONE TCP HTTP CLIENT](./demos/sdk/democyclonetcphttpclient/project/resources/details.md)
-    + *DMA*
-      + [M2M](./demos/sdk/demodmam2m/project/resources/details.md)
-    + *RTC*
-      + [CLOCK](./demos/sdk/demortc/project/resources/details.md)
-    + *USB*
-      + [CDC](./demos/sdk/demousbcdc/project/resources/details.md)
-      + [HID](./demos/sdk/demousbhid/project/resources/details.md)
-      + [MIDI](./demos/sdk/demousbmidi/project/resources/details.md)
+    + [GPIO](./demos/sdk/demogpio/project/README.md)
+      + [DIGITAL INPUT/OUTPUT](./demos/sdk/demogpio/project/digitalinputoutput/README.md)
+      + [LED BLINKING](./demos/sdk/demogpio/project/ledblinking/README.md)
+      + [LED CURTAIN](./demos/sdk/demogpio/project/ledcurtain/README.md)
+      + [PORT BLINKING](./demos/sdk/port/README.md)
+    + [ADC](./demos/sdk/demoanalogin/project/README.md)
+      + [ANALOG IN CONVERSION](./demos/sdk/demoanalogin/project/README.md)
+    + [I2C](./demos/sdk/demoi2c/project/README.md)
+      + [I2C WRITE READ](./demos/sdk/demoi2c/project/README.md)
+    + [PWM](./demos/sdk/demopwm/project/README.md)
+      + [PWM LED BLINKING](./demos/sdk/demopwm/project/README.md)
+    + [SPI](./demos/sdk/demospi/project/README.md)
+      + [SPI WRITE READ](./demos/sdk/demospi/project/README.md)
+    + [UART](./demos/sdk/demouart/project/README.md)
+      + [UART ECHO](./demos/sdk/demouart/project/README.md)
+    + [CAN](./demos/sdk/democan/project/README.md)
+      + [LOOPBACK](./demos/sdk/democan/project/loopback/README.md)
+      + [RECEIVE](./demos/sdk/democan/project/receive/README.md)
+      + [TRANSMIT](./demos/sdk/democan/project/transmit/README.md)
+    + [ETHERNET](./demos/sdk/democyclonetcp/project/README.md)
+      + [CYCLONE TCP ECHO SERVER](./demos/sdk/democyclonetcp/project/echoserver/README.md)
+      + [CYCLONE TCP FTP CLIENT](./demos/sdk/democyclonetcp/project/ftpclient/README.md)
+      + [CYCLONE TCP HTTP CLIENT](./demos/sdk/democyclonetcp/project/httpclient/README.md)
+    + [DMA](./demos/sdk/demodmam2m/project/README.md)
+      + [M2M](./demos/sdk/demodmam2m/project/README.md)
+    + [RTC](./demos/sdk/demortc/project/README.md)
+      + [CLOCK](./demos/sdk/demortc/project/README.md)
+    + [USB](./demos/sdk/demousb/project/README.md)
+      + [CDC](./demos/sdk/demousb/project/cdc/README.md)
+      + [HID](./demos/sdk/demousb/project/hid/README.md)
+      + [MIDI](./demos/sdk/demousb/project/midi/README.md)
   + *DISPLAY*
-    + [LCD](./demos/sdk/demolcd/project/resources/details.md)
-    + [DESIGNER](./demos/sdk/demodesigner/project/resources/details.md)
+    + [LCD](./demos/sdk/demolcd/project/README.md)
+    + [DESIGNER](./demos/sdk/demodesigner/project/README.md)
     + [LVGL-TODO](TODO)
 
 ---
diff --git a/demos/sdk/demoanalogin/project/resources/details.md b/demos/sdk/demoanalogin/project/README.md
similarity index 100%
rename from demos/sdk/demoanalogin/project/resources/details.md
rename to demos/sdk/demoanalogin/project/README.md
diff --git a/demos/sdk/demoanalogin/project/resources/changelog.md b/demos/sdk/demoanalogin/project/changelog.md
similarity index 100%
rename from demos/sdk/demoanalogin/project/resources/changelog.md
rename to demos/sdk/demoanalogin/project/changelog.md
diff --git a/demos/sdk/demoanalogin/project/manifest.json b/demos/sdk/demoanalogin/project/manifest.json
index e257ebd..bda6310 100644
--- a/demos/sdk/demoanalogin/project/manifest.json
+++ b/demos/sdk/demoanalogin/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "Analog Input Demo",
     "name": "mikroe.demo.sdk.analogin",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demoanalogin/project"
+}
diff --git a/demos/sdk/democan/project/CMakeLists.txt b/demos/sdk/democan/project/CMakeLists.txt
new file mode 100644
index 0000000..799f97e
--- /dev/null
+++ b/demos/sdk/democan/project/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.21)
+
+if (${TOOLCHAIN_LANGUAGE} MATCHES "MikroC")
+    project(can_demo_pack LANGUAGES MikroC)
+else()
+    project(can_demo_pack LANGUAGES C ASM)
+endif()
+
+## Receive
+add_subdirectory(receive)
+
+## Transmit
+add_subdirectory(transmit)
+
+## Loopback
+add_subdirectory(loopback)
diff --git a/demos/sdk/democan/project/README.md b/demos/sdk/democan/project/README.md
new file mode 100644
index 0000000..36e50cf
--- /dev/null
+++ b/demos/sdk/democan/project/README.md
@@ -0,0 +1,15 @@
+# CAN DEMO PACK
+
+---
+
+- **Authors**     : [MikroE](https://github.com/MikroElektronika)
+- **Version**     : 3.0.0
+- **Date**        : ${COPYRIGHT_YEAR}.
+
+## CONTENTS
+
+- [LOOPBACK](./loopback/README.md)
+- [TRANSMIT](./transmit/README.md)
+- [RECEIVE](./receive/README.md)
+
+---
diff --git a/demos/sdk/democanloopback/project/CMakeLists.txt b/demos/sdk/democan/project/loopback/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democanloopback/project/CMakeLists.txt
rename to demos/sdk/democan/project/loopback/CMakeLists.txt
diff --git a/demos/sdk/democanloopback/project/resources/details.md b/demos/sdk/democan/project/loopback/README.md
similarity index 100%
rename from demos/sdk/democanloopback/project/resources/details.md
rename to demos/sdk/democan/project/loopback/README.md
diff --git a/demos/sdk/democanloopback/project/resources/changelog.md b/demos/sdk/democan/project/loopback/changelog.md
similarity index 100%
rename from demos/sdk/democanloopback/project/resources/changelog.md
rename to demos/sdk/democan/project/loopback/changelog.md
diff --git a/demos/sdk/democanloopback/project/main.c b/demos/sdk/democan/project/loopback/main.c
similarity index 100%
rename from demos/sdk/democanloopback/project/main.c
rename to demos/sdk/democan/project/loopback/main.c
diff --git a/demos/sdk/democan/project/manifest.json b/demos/sdk/democan/project/manifest.json
new file mode 100644
index 0000000..8ce5464
--- /dev/null
+++ b/demos/sdk/democan/project/manifest.json
@@ -0,0 +1,16 @@
+{
+    "contents": {
+        "clicks": [],
+        "examples": [
+            {
+                "path": "CAN Demo Pack"
+            }
+        ]
+    },
+    "display_name": "CAN Demo Pack",
+    "name": "mikroe.demo.sdk.can.pack",
+    "type": "project",
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/democan/project"
+}
diff --git a/demos/sdk/democanreceive/project/CMakeLists.txt b/demos/sdk/democan/project/receive/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democanreceive/project/CMakeLists.txt
rename to demos/sdk/democan/project/receive/CMakeLists.txt
diff --git a/demos/sdk/democanreceive/project/resources/details.md b/demos/sdk/democan/project/receive/README.md
similarity index 100%
rename from demos/sdk/democanreceive/project/resources/details.md
rename to demos/sdk/democan/project/receive/README.md
diff --git a/demos/sdk/democanreceive/project/resources/changelog.md b/demos/sdk/democan/project/receive/changelog.md
similarity index 100%
rename from demos/sdk/democanreceive/project/resources/changelog.md
rename to demos/sdk/democan/project/receive/changelog.md
diff --git a/demos/sdk/democanreceive/project/main.c b/demos/sdk/democan/project/receive/main.c
similarity index 100%
rename from demos/sdk/democanreceive/project/main.c
rename to demos/sdk/democan/project/receive/main.c
diff --git a/demos/sdk/democantransmit/project/CMakeLists.txt b/demos/sdk/democan/project/transmit/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democantransmit/project/CMakeLists.txt
rename to demos/sdk/democan/project/transmit/CMakeLists.txt
diff --git a/demos/sdk/democantransmit/project/resources/details.md b/demos/sdk/democan/project/transmit/README.md
similarity index 100%
rename from demos/sdk/democantransmit/project/resources/details.md
rename to demos/sdk/democan/project/transmit/README.md
diff --git a/demos/sdk/democantransmit/project/resources/changelog.md b/demos/sdk/democan/project/transmit/changelog.md
similarity index 100%
rename from demos/sdk/democantransmit/project/resources/changelog.md
rename to demos/sdk/democan/project/transmit/changelog.md
diff --git a/demos/sdk/democantransmit/project/main.c b/demos/sdk/democan/project/transmit/main.c
similarity index 100%
rename from demos/sdk/democantransmit/project/main.c
rename to demos/sdk/democan/project/transmit/main.c
diff --git a/demos/sdk/democanloopback/project/manifest.json b/demos/sdk/democanloopback/project/manifest.json
deleted file mode 100644
index 6e47bdf..0000000
--- a/demos/sdk/democanloopback/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CAN Loopback Mode Demo"
-            }
-        ]
-    },
-    "display_name": "CAN Loopback Mode Demo",
-    "name": "mikroe.demo.sdk.can.loopback",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democanreceive/project/manifest.json b/demos/sdk/democanreceive/project/manifest.json
deleted file mode 100644
index aa4cb4c..0000000
--- a/demos/sdk/democanreceive/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CAN Receive Demo"
-            }
-        ]
-    },
-    "display_name": "CAN Receive Demo",
-    "name": "mikroe.demo.sdk.can.receive",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democantransmit/project/manifest.json b/demos/sdk/democantransmit/project/manifest.json
deleted file mode 100644
index cca2d0d..0000000
--- a/demos/sdk/democantransmit/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CAN Transmit Demo"
-            }
-        ]
-    },
-    "display_name": "CAN Transmit Demo",
-    "name": "mikroe.demo.sdk.can.transmit",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democantransmit/project/resources/mikrosdk.png b/demos/sdk/democantransmit/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/democantransmit/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/democyclonetcp/project/CMakeLists.txt b/demos/sdk/democyclonetcp/project/CMakeLists.txt
new file mode 100644
index 0000000..b3d286d
--- /dev/null
+++ b/demos/sdk/democyclonetcp/project/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.21)
+
+if (${TOOLCHAIN_LANGUAGE} MATCHES "MikroC")
+    message(FATAL_ERROR "MikroC not supported for this demo.")
+else()
+    project(cyclonetcp_demo_pack LANGUAGES C ASM)
+endif()
+
+## FTP CLIENT
+add_subdirectory(ftpclient)
+
+## ECHO SERVER
+add_subdirectory(echoserver)
+
+## HTTP CLIENT
+add_subdirectory(httpclient)
diff --git a/demos/sdk/democyclonetcp/project/README.md b/demos/sdk/democyclonetcp/project/README.md
new file mode 100644
index 0000000..b4527ff
--- /dev/null
+++ b/demos/sdk/democyclonetcp/project/README.md
@@ -0,0 +1,15 @@
+# CYCLONETCP DEMO PACK
+
+---
+
+- **Authors**     : [MikroE](https://github.com/MikroElektronika)
+- **Version**     : 3.0.0
+- **Date**        : ${COPYRIGHT_YEAR}.
+
+## CONTENTS
+
+- [FTP CLIENT](./ftpclient/README.md)
+- [ECHO SERVER](./echoserver/README.md)
+- [HTTP CLIENT](./httpclient/README.md)
+
+---
diff --git a/demos/sdk/democyclonetcpechoserver/project/CMakeLists.txt b/demos/sdk/democyclonetcp/project/echoserver/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/CMakeLists.txt
rename to demos/sdk/democyclonetcp/project/echoserver/CMakeLists.txt
diff --git a/demos/sdk/democyclonetcpechoserver/project/resources/details.md b/demos/sdk/democyclonetcp/project/echoserver/README.md
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/resources/details.md
rename to demos/sdk/democyclonetcp/project/echoserver/README.md
diff --git a/demos/sdk/democyclonetcpechoserver/project/resources/changelog.md b/demos/sdk/democyclonetcp/project/echoserver/changelog.md
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/resources/changelog.md
rename to demos/sdk/democyclonetcp/project/echoserver/changelog.md
diff --git a/demos/sdk/democyclonetcpechoserver/project/main.c b/demos/sdk/democyclonetcp/project/echoserver/main.c
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/main.c
rename to demos/sdk/democyclonetcp/project/echoserver/main.c
diff --git a/demos/sdk/democyclonetcpechoserver/project/systick.h b/demos/sdk/democyclonetcp/project/echoserver/systick.h
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/systick.h
rename to demos/sdk/democyclonetcp/project/echoserver/systick.h
diff --git a/demos/sdk/democyclonetcpechoserver/project/timer.h b/demos/sdk/democyclonetcp/project/echoserver/timer.h
similarity index 100%
rename from demos/sdk/democyclonetcpechoserver/project/timer.h
rename to demos/sdk/democyclonetcp/project/echoserver/timer.h
diff --git a/demos/sdk/democyclonetcpftpclient/project/CMakeLists.txt b/demos/sdk/democyclonetcp/project/ftpclient/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/CMakeLists.txt
rename to demos/sdk/democyclonetcp/project/ftpclient/CMakeLists.txt
diff --git a/demos/sdk/democyclonetcpftpclient/project/resources/details.md b/demos/sdk/democyclonetcp/project/ftpclient/README.md
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/resources/details.md
rename to demos/sdk/democyclonetcp/project/ftpclient/README.md
diff --git a/demos/sdk/democyclonetcpftpclient/project/resources/changelog.md b/demos/sdk/democyclonetcp/project/ftpclient/changelog.md
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/resources/changelog.md
rename to demos/sdk/democyclonetcp/project/ftpclient/changelog.md
diff --git a/demos/sdk/democyclonetcpftpclient/project/main.c b/demos/sdk/democyclonetcp/project/ftpclient/main.c
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/main.c
rename to demos/sdk/democyclonetcp/project/ftpclient/main.c
diff --git a/demos/sdk/democyclonetcpftpclient/project/systick.h b/demos/sdk/democyclonetcp/project/ftpclient/systick.h
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/systick.h
rename to demos/sdk/democyclonetcp/project/ftpclient/systick.h
diff --git a/demos/sdk/democyclonetcpftpclient/project/timer.h b/demos/sdk/democyclonetcp/project/ftpclient/timer.h
similarity index 100%
rename from demos/sdk/democyclonetcpftpclient/project/timer.h
rename to demos/sdk/democyclonetcp/project/ftpclient/timer.h
diff --git a/demos/sdk/democyclonetcphttpclient/project/CMakeLists.txt b/demos/sdk/democyclonetcp/project/httpclient/CMakeLists.txt
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/CMakeLists.txt
rename to demos/sdk/democyclonetcp/project/httpclient/CMakeLists.txt
diff --git a/demos/sdk/democyclonetcphttpclient/project/resources/details.md b/demos/sdk/democyclonetcp/project/httpclient/README.md
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/resources/details.md
rename to demos/sdk/democyclonetcp/project/httpclient/README.md
diff --git a/demos/sdk/democyclonetcphttpclient/project/resources/changelog.md b/demos/sdk/democyclonetcp/project/httpclient/changelog.md
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/resources/changelog.md
rename to demos/sdk/democyclonetcp/project/httpclient/changelog.md
diff --git a/demos/sdk/democyclonetcphttpclient/project/main.c b/demos/sdk/democyclonetcp/project/httpclient/main.c
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/main.c
rename to demos/sdk/democyclonetcp/project/httpclient/main.c
diff --git a/demos/sdk/democyclonetcphttpclient/project/systick.h b/demos/sdk/democyclonetcp/project/httpclient/systick.h
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/systick.h
rename to demos/sdk/democyclonetcp/project/httpclient/systick.h
diff --git a/demos/sdk/democyclonetcphttpclient/project/timer.h b/demos/sdk/democyclonetcp/project/httpclient/timer.h
similarity index 100%
rename from demos/sdk/democyclonetcphttpclient/project/timer.h
rename to demos/sdk/democyclonetcp/project/httpclient/timer.h
diff --git a/demos/sdk/democyclonetcp/project/manifest.json b/demos/sdk/democyclonetcp/project/manifest.json
new file mode 100644
index 0000000..c34d8dd
--- /dev/null
+++ b/demos/sdk/democyclonetcp/project/manifest.json
@@ -0,0 +1,16 @@
+{
+    "contents": {
+        "clicks": [],
+        "examples": [
+            {
+                "path": "CycloneTCP Demo Pack"
+            }
+        ]
+    },
+    "display_name": "CycloneTCP Demo Pack",
+    "name": "mikroe.demo.sdk.cyclonetcp.pack",
+    "type": "project",
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/democyclonetcp/project"
+}
diff --git a/demos/sdk/democyclonetcpechoserver/project/manifest.json b/demos/sdk/democyclonetcpechoserver/project/manifest.json
deleted file mode 100644
index 142a0f5..0000000
--- a/demos/sdk/democyclonetcpechoserver/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CycloneTCP Echo Server Demo"
-            }
-        ]
-    },
-    "display_name": "CycloneTCP Echo Server Demo",
-    "name": "mikroe.demo.sdk.cyclonetcp.echo.server",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democyclonetcpechoserver/project/resources/mikrosdk.png b/demos/sdk/democyclonetcpechoserver/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/democyclonetcpechoserver/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/democyclonetcpftpclient/project/manifest.json b/demos/sdk/democyclonetcpftpclient/project/manifest.json
deleted file mode 100644
index 1ff760b..0000000
--- a/demos/sdk/democyclonetcpftpclient/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CycloneTCP FTP Client Demo"
-            }
-        ]
-    },
-    "display_name": "CycloneTCP FTP Client Demo",
-    "name": "mikroe.demo.sdk.cyclonetcp.ftp.client",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democyclonetcpftpclient/project/resources/mikrosdk.png b/demos/sdk/democyclonetcpftpclient/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/democyclonetcpftpclient/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/democyclonetcphttpclient/project/manifest.json b/demos/sdk/democyclonetcphttpclient/project/manifest.json
deleted file mode 100644
index 2bc3504..0000000
--- a/demos/sdk/democyclonetcphttpclient/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "CycloneTCP HTTP Client Demo"
-            }
-        ]
-    },
-    "display_name": "CycloneTCP HTTP Client Demo",
-    "name": "mikroe.demo.sdk.cyclonetcp.http.client",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/democyclonetcphttpclient/project/resources/mikrosdk.png b/demos/sdk/democyclonetcphttpclient/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/democyclonetcphttpclient/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demodesigner/project/resources/details.md b/demos/sdk/demodesigner/project/README.md
similarity index 100%
rename from demos/sdk/demodesigner/project/resources/details.md
rename to demos/sdk/demodesigner/project/README.md
diff --git a/demos/sdk/demodesigner/project/resources/changelog.md b/demos/sdk/demodesigner/project/changelog.md
similarity index 100%
rename from demos/sdk/demodesigner/project/resources/changelog.md
rename to demos/sdk/demodesigner/project/changelog.md
diff --git a/demos/sdk/demodesigner/project/manifest.json b/demos/sdk/demodesigner/project/manifest.json
index d8009f9..1f25e15 100644
--- a/demos/sdk/demodesigner/project/manifest.json
+++ b/demos/sdk/demodesigner/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "Designer Tool Demo",
     "name": "mikroe.demo.sdk.designer",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demodesigner/project"
+}
diff --git a/demos/sdk/demodigitalinputoutput/project/manifest.json b/demos/sdk/demodigitalinputoutput/project/manifest.json
deleted file mode 100644
index 9521efb..0000000
--- a/demos/sdk/demodigitalinputoutput/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "Digital Input Output Demo"
-            }
-        ]
-    },
-    "display_name": "Digital Input Output Demo",
-    "name": "mikroe.demo.sdk.digitalinputoutput",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demodigitalinputoutput/project/resources/mikrosdk.png b/demos/sdk/demodigitalinputoutput/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demodigitalinputoutput/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demodmam2m/project/resources/details.md b/demos/sdk/demodmam2m/project/README.md
similarity index 100%
rename from demos/sdk/demodmam2m/project/resources/details.md
rename to demos/sdk/demodmam2m/project/README.md
diff --git a/demos/sdk/demodmam2m/project/resources/changelog.md b/demos/sdk/demodmam2m/project/changelog.md
similarity index 100%
rename from demos/sdk/demodmam2m/project/resources/changelog.md
rename to demos/sdk/demodmam2m/project/changelog.md
diff --git a/demos/sdk/demodmam2m/project/manifest.json b/demos/sdk/demodmam2m/project/manifest.json
index 6c477e3..cb1d9c5 100644
--- a/demos/sdk/demodmam2m/project/manifest.json
+++ b/demos/sdk/demodmam2m/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "DMA Memory to Memory Demo",
     "name": "mikroe.demo.sdk.dma.m2m",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demodmam2m/project"
+}
diff --git a/demos/sdk/demodmam2m/project/resources/mikrosdk.png b/demos/sdk/demodmam2m/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demodmam2m/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demogpio/project/CMakeLists.txt b/demos/sdk/demogpio/project/CMakeLists.txt
new file mode 100644
index 0000000..47900f0
--- /dev/null
+++ b/demos/sdk/demogpio/project/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.21)
+
+if (${TOOLCHAIN_LANGUAGE} MATCHES "MikroC")
+    project(gpio_demo_pack LANGUAGES MikroC)
+else()
+    project(gpio_demo_pack LANGUAGES C ASM)
+endif()
+
+## Port
+add_subdirectory(demoport)
+
+## LED curtain
+add_subdirectory(demoledcurtain)
+
+## LED blinking
+add_subdirectory(demoledblinking)
+
+## Read input on one pin, display output on another pin
+add_subdirectory(demodigitalinputoutput)
diff --git a/demos/sdk/demogpio/project/README.md b/demos/sdk/demogpio/project/README.md
new file mode 100644
index 0000000..a4eefc9
--- /dev/null
+++ b/demos/sdk/demogpio/project/README.md
@@ -0,0 +1,16 @@
+# GPIO DEMO PACK
+
+---
+
+- **Authors**     : [MikroE](https://github.com/MikroElektronika)
+- **Version**     : 3.0.0
+- **Date**        : ${COPYRIGHT_YEAR}.
+
+## CONTENTS
+
+- [PORT](./port/README.md)
+- [LED CURTAIN](./ledcurtain/README.md)
+- [LED BLINKING](./ledblinking/README.md)
+- [DIGITAL INPUT/OUTPUT](./digitalinputoutput/README.md)
+
+---
diff --git a/demos/sdk/demodigitalinputoutput/project/CMakeLists.txt b/demos/sdk/demogpio/project/digitalinputoutput/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/CMakeLists.txt
rename to demos/sdk/demogpio/project/digitalinputoutput/CMakeLists.txt
diff --git a/demos/sdk/demodigitalinputoutput/project/resources/details.md b/demos/sdk/demogpio/project/digitalinputoutput/README.md
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/resources/details.md
rename to demos/sdk/demogpio/project/digitalinputoutput/README.md
diff --git a/demos/sdk/demodigitalinputoutput/project/resources/changelog.md b/demos/sdk/demogpio/project/digitalinputoutput/changelog.md
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/resources/changelog.md
rename to demos/sdk/demogpio/project/digitalinputoutput/changelog.md
diff --git a/demos/sdk/demodigitalinputoutput/project/digital_in_out.c b/demos/sdk/demogpio/project/digitalinputoutput/digital_in_out.c
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/digital_in_out.c
rename to demos/sdk/demogpio/project/digitalinputoutput/digital_in_out.c
diff --git a/demos/sdk/demodigitalinputoutput/project/digital_in_out.h b/demos/sdk/demogpio/project/digitalinputoutput/digital_in_out.h
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/digital_in_out.h
rename to demos/sdk/demogpio/project/digitalinputoutput/digital_in_out.h
diff --git a/demos/sdk/demodigitalinputoutput/project/main.c b/demos/sdk/demogpio/project/digitalinputoutput/main.c
similarity index 100%
rename from demos/sdk/demodigitalinputoutput/project/main.c
rename to demos/sdk/demogpio/project/digitalinputoutput/main.c
diff --git a/demos/sdk/demoledblinking/project/CMakeLists.txt b/demos/sdk/demogpio/project/ledblinking/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demoledblinking/project/CMakeLists.txt
rename to demos/sdk/demogpio/project/ledblinking/CMakeLists.txt
diff --git a/demos/sdk/demoledblinking/project/resources/details.md b/demos/sdk/demogpio/project/ledblinking/README.md
similarity index 100%
rename from demos/sdk/demoledblinking/project/resources/details.md
rename to demos/sdk/demogpio/project/ledblinking/README.md
diff --git a/demos/sdk/demoledblinking/project/resources/changelog.md b/demos/sdk/demogpio/project/ledblinking/changelog.md
similarity index 100%
rename from demos/sdk/demoledblinking/project/resources/changelog.md
rename to demos/sdk/demogpio/project/ledblinking/changelog.md
diff --git a/demos/sdk/demoledblinking/project/main.c b/demos/sdk/demogpio/project/ledblinking/main.c
similarity index 100%
rename from demos/sdk/demoledblinking/project/main.c
rename to demos/sdk/demogpio/project/ledblinking/main.c
diff --git a/demos/sdk/demoledcurtain/project/CMakeLists.txt b/demos/sdk/demogpio/project/ledcurtain/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demoledcurtain/project/CMakeLists.txt
rename to demos/sdk/demogpio/project/ledcurtain/CMakeLists.txt
diff --git a/demos/sdk/demoledcurtain/project/resources/details.md b/demos/sdk/demogpio/project/ledcurtain/README.md
similarity index 100%
rename from demos/sdk/demoledcurtain/project/resources/details.md
rename to demos/sdk/demogpio/project/ledcurtain/README.md
diff --git a/demos/sdk/demoledcurtain/project/resources/changelog.md b/demos/sdk/demogpio/project/ledcurtain/changelog.md
similarity index 100%
rename from demos/sdk/demoledcurtain/project/resources/changelog.md
rename to demos/sdk/demogpio/project/ledcurtain/changelog.md
diff --git a/demos/sdk/demoledcurtain/project/main.c b/demos/sdk/demogpio/project/ledcurtain/main.c
similarity index 100%
rename from demos/sdk/demoledcurtain/project/main.c
rename to demos/sdk/demogpio/project/ledcurtain/main.c
diff --git a/demos/sdk/demogpio/project/manifest.json b/demos/sdk/demogpio/project/manifest.json
new file mode 100644
index 0000000..7046ee0
--- /dev/null
+++ b/demos/sdk/demogpio/project/manifest.json
@@ -0,0 +1,16 @@
+{
+    "contents": {
+        "clicks": [],
+        "examples": [
+            {
+                "path": "GPIO Demo Pack"
+            }
+        ]
+    },
+    "display_name": "GPIO Demo Pack",
+    "name": "mikroe.demo.sdk.gpio.pack",
+    "type": "project",
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demogpio/project"
+}
diff --git a/demos/sdk/demoport/project/CMakeLists.txt b/demos/sdk/demogpio/project/port/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demoport/project/CMakeLists.txt
rename to demos/sdk/demogpio/project/port/CMakeLists.txt
diff --git a/demos/sdk/demoport/project/resources/details.md b/demos/sdk/demogpio/project/port/README.md
similarity index 100%
rename from demos/sdk/demoport/project/resources/details.md
rename to demos/sdk/demogpio/project/port/README.md
diff --git a/demos/sdk/demoport/project/resources/changelog.md b/demos/sdk/demogpio/project/port/changelog.md
similarity index 100%
rename from demos/sdk/demoport/project/resources/changelog.md
rename to demos/sdk/demogpio/project/port/changelog.md
diff --git a/demos/sdk/demoport/project/main.c b/demos/sdk/demogpio/project/port/main.c
similarity index 100%
rename from demos/sdk/demoport/project/main.c
rename to demos/sdk/demogpio/project/port/main.c
diff --git a/demos/sdk/demoport/project/ports.h b/demos/sdk/demogpio/project/port/ports.h
similarity index 100%
rename from demos/sdk/demoport/project/ports.h
rename to demos/sdk/demogpio/project/port/ports.h
diff --git a/demos/sdk/demoi2c/project/resources/details.md b/demos/sdk/demoi2c/project/README.md
similarity index 100%
rename from demos/sdk/demoi2c/project/resources/details.md
rename to demos/sdk/demoi2c/project/README.md
diff --git a/demos/sdk/demoi2c/project/resources/changelog.md b/demos/sdk/demoi2c/project/changelog.md
similarity index 100%
rename from demos/sdk/demoi2c/project/resources/changelog.md
rename to demos/sdk/demoi2c/project/changelog.md
diff --git a/demos/sdk/demoi2c/project/manifest.json b/demos/sdk/demoi2c/project/manifest.json
index baa1460..f73304b 100644
--- a/demos/sdk/demoi2c/project/manifest.json
+++ b/demos/sdk/demoi2c/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "I2C Demo",
     "name": "mikroe.demo.sdk.i2c",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demoi2c/project"
+}
diff --git a/demos/sdk/demoi2c/project/resources/mikrosdk.png b/demos/sdk/demoi2c/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demoi2c/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demolcd/project/resources/details.md b/demos/sdk/demolcd/project/README.md
similarity index 100%
rename from demos/sdk/demolcd/project/resources/details.md
rename to demos/sdk/demolcd/project/README.md
diff --git a/demos/sdk/demolcd/project/resources/changelog.md b/demos/sdk/demolcd/project/changelog.md
similarity index 100%
rename from demos/sdk/demolcd/project/resources/changelog.md
rename to demos/sdk/demolcd/project/changelog.md
diff --git a/demos/sdk/demolcd/project/manifest.json b/demos/sdk/demolcd/project/manifest.json
index 40e8bbb..aad12d7 100644
--- a/demos/sdk/demolcd/project/manifest.json
+++ b/demos/sdk/demolcd/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "LCD Demo",
     "name": "mikroe.demo.sdk.lcddemo",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demolcd/project"
+}
diff --git a/demos/sdk/demolcd/project/resources/mikrosdk.png b/demos/sdk/demolcd/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demolcd/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demoledblinking/project/manifest.json b/demos/sdk/demoledblinking/project/manifest.json
deleted file mode 100644
index 5e938ee..0000000
--- a/demos/sdk/demoledblinking/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "LED Blinking Demo"
-            }
-        ]
-    },
-    "display_name": "LED Blinking Demo",
-    "name": "mikroe.demo.sdk.ledblinking",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demoledblinking/project/resources/mikrosdk.png b/demos/sdk/demoledblinking/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demoledblinking/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demoledcurtain/project/manifest.json b/demos/sdk/demoledcurtain/project/manifest.json
deleted file mode 100644
index 45eb91d..0000000
--- a/demos/sdk/demoledcurtain/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "LED Curtain Demo"
-            }
-        ]
-    },
-    "display_name": "LED Curtain Demo",
-    "name": "mikroe.demo.sdk.ledcurtain",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demoledcurtain/project/resources/mikrosdk.png b/demos/sdk/demoledcurtain/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demoledcurtain/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demoport/project/manifest.json b/demos/sdk/demoport/project/manifest.json
deleted file mode 100644
index b18ebdc..0000000
--- a/demos/sdk/demoport/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "Port Demo"
-            }
-        ]
-    },
-    "display_name": "Port Demo",
-    "name": "mikroe.demo.sdk.portdemo",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demoport/project/resources/mikrosdk.png b/demos/sdk/demoport/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demoport/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demopwm/project/resources/details.md b/demos/sdk/demopwm/project/README.md
similarity index 100%
rename from demos/sdk/demopwm/project/resources/details.md
rename to demos/sdk/demopwm/project/README.md
diff --git a/demos/sdk/demopwm/project/resources/changelog.md b/demos/sdk/demopwm/project/changelog.md
similarity index 100%
rename from demos/sdk/demopwm/project/resources/changelog.md
rename to demos/sdk/demopwm/project/changelog.md
diff --git a/demos/sdk/demopwm/project/manifest.json b/demos/sdk/demopwm/project/manifest.json
index 0512641..caefcea 100644
--- a/demos/sdk/demopwm/project/manifest.json
+++ b/demos/sdk/demopwm/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "PWM Demo",
     "name": "mikroe.demo.sdk.pwmdemo",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demopwm/project"
+}
diff --git a/demos/sdk/demopwm/project/resources/mikrosdk.png b/demos/sdk/demopwm/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demopwm/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demortc/project/resources/details.md b/demos/sdk/demortc/project/README.md
similarity index 100%
rename from demos/sdk/demortc/project/resources/details.md
rename to demos/sdk/demortc/project/README.md
diff --git a/demos/sdk/demortc/project/resources/changelog.md b/demos/sdk/demortc/project/changelog.md
similarity index 100%
rename from demos/sdk/demortc/project/resources/changelog.md
rename to demos/sdk/demortc/project/changelog.md
diff --git a/demos/sdk/demortc/project/manifest.json b/demos/sdk/demortc/project/manifest.json
index 4a53de3..932335e 100644
--- a/demos/sdk/demortc/project/manifest.json
+++ b/demos/sdk/demortc/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "RTC Demo",
     "name": "mikroe.demo.sdk.rtc",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demortc/project"
+}
diff --git a/demos/sdk/demortc/project/resources/mikrosdk.png b/demos/sdk/demortc/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demortc/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demospi/project/resources/details.md b/demos/sdk/demospi/project/README.md
similarity index 100%
rename from demos/sdk/demospi/project/resources/details.md
rename to demos/sdk/demospi/project/README.md
diff --git a/demos/sdk/demospi/project/resources/changelog.md b/demos/sdk/demospi/project/changelog.md
similarity index 100%
rename from demos/sdk/demospi/project/resources/changelog.md
rename to demos/sdk/demospi/project/changelog.md
diff --git a/demos/sdk/demospi/project/manifest.json b/demos/sdk/demospi/project/manifest.json
index 0ecfb96..43d139e 100644
--- a/demos/sdk/demospi/project/manifest.json
+++ b/demos/sdk/demospi/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "SPI Demo",
     "name": "mikroe.demo.sdk.spi",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demospi/project"
+}
diff --git a/demos/sdk/demospi/project/resources/mikrosdk.png b/demos/sdk/demospi/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demospi/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demouart/project/resources/details.md b/demos/sdk/demouart/project/README.md
similarity index 100%
rename from demos/sdk/demouart/project/resources/details.md
rename to demos/sdk/demouart/project/README.md
diff --git a/demos/sdk/demouart/project/resources/changelog.md b/demos/sdk/demouart/project/changelog.md
similarity index 100%
rename from demos/sdk/demouart/project/resources/changelog.md
rename to demos/sdk/demouart/project/changelog.md
diff --git a/demos/sdk/demouart/project/manifest.json b/demos/sdk/demouart/project/manifest.json
index 09e3e01..7bd06ec 100644
--- a/demos/sdk/demouart/project/manifest.json
+++ b/demos/sdk/demouart/project/manifest.json
@@ -10,5 +10,7 @@
     "display_name": "UART Demo",
     "name": "mikroe.demo.sdk.uart",
     "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demouart/project"
+}
diff --git a/demos/sdk/demouart/project/resources/mikrosdk.png b/demos/sdk/demouart/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demouart/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demousb/project/CMakeLists.txt b/demos/sdk/demousb/project/CMakeLists.txt
new file mode 100644
index 0000000..de15f24
--- /dev/null
+++ b/demos/sdk/demousb/project/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.21)
+
+if (${TOOLCHAIN_LANGUAGE} MATCHES "MikroC")
+    message(FATAL_ERROR "MikroC not supported for this demo.")
+else()
+    project(usb_demo_pack LANGUAGES C ASM)
+endif()
+
+## HID
+add_subdirectory(hid)
+
+## CDC
+add_subdirectory(cdc)
+
+## MIDI
+add_subdirectory(midi)
diff --git a/demos/sdk/demousb/project/README.md b/demos/sdk/demousb/project/README.md
new file mode 100644
index 0000000..c3fe131
--- /dev/null
+++ b/demos/sdk/demousb/project/README.md
@@ -0,0 +1,15 @@
+# CAN DEMO PACK
+
+---
+
+- **Authors**     : [MikroE](https://github.com/MikroElektronika)
+- **Version**     : 3.0.0
+- **Date**        : ${COPYRIGHT_YEAR}.
+
+## CONTENTS
+
+- [HID](./hid/README.md)
+- [CDC](./cdc/README.md)
+- [MIDI](./midi/README.md)
+
+---
diff --git a/demos/sdk/demousbcdc/project/CMakeLists.txt b/demos/sdk/demousb/project/cdc/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demousbcdc/project/CMakeLists.txt
rename to demos/sdk/demousb/project/cdc/CMakeLists.txt
diff --git a/demos/sdk/demousbcdc/project/resources/details.md b/demos/sdk/demousb/project/cdc/README.md
similarity index 100%
rename from demos/sdk/demousbcdc/project/resources/details.md
rename to demos/sdk/demousb/project/cdc/README.md
diff --git a/demos/sdk/demousbcdc/project/resources/changelog.md b/demos/sdk/demousb/project/cdc/changelog.md
similarity index 100%
rename from demos/sdk/demousbcdc/project/resources/changelog.md
rename to demos/sdk/demousb/project/cdc/changelog.md
diff --git a/demos/sdk/demousbcdc/project/main.c b/demos/sdk/demousb/project/cdc/main.c
similarity index 100%
rename from demos/sdk/demousbcdc/project/main.c
rename to demos/sdk/demousb/project/cdc/main.c
diff --git a/demos/sdk/demousbcdc/project/msc_disk.c b/demos/sdk/demousb/project/cdc/msc_disk.c
similarity index 100%
rename from demos/sdk/demousbcdc/project/msc_disk.c
rename to demos/sdk/demousb/project/cdc/msc_disk.c
diff --git a/demos/sdk/demoanalogin/project/resources/mikrosdk.png b/demos/sdk/demousb/project/cdc/resources/mikrosdk.png
similarity index 100%
rename from demos/sdk/demoanalogin/project/resources/mikrosdk.png
rename to demos/sdk/demousb/project/cdc/resources/mikrosdk.png
diff --git a/demos/sdk/demousbcdc/project/usb_descriptors.c b/demos/sdk/demousb/project/cdc/usb_descriptors.c
similarity index 100%
rename from demos/sdk/demousbcdc/project/usb_descriptors.c
rename to demos/sdk/demousb/project/cdc/usb_descriptors.c
diff --git a/demos/sdk/demousbhid/project/CMakeLists.txt b/demos/sdk/demousb/project/hid/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demousbhid/project/CMakeLists.txt
rename to demos/sdk/demousb/project/hid/CMakeLists.txt
diff --git a/demos/sdk/demousbhid/project/resources/details.md b/demos/sdk/demousb/project/hid/README.md
similarity index 100%
rename from demos/sdk/demousbhid/project/resources/details.md
rename to demos/sdk/demousb/project/hid/README.md
diff --git a/demos/sdk/demousbhid/project/resources/changelog.md b/demos/sdk/demousb/project/hid/changelog.md
similarity index 100%
rename from demos/sdk/demousbhid/project/resources/changelog.md
rename to demos/sdk/demousb/project/hid/changelog.md
diff --git a/demos/sdk/demousbhid/project/main.c b/demos/sdk/demousb/project/hid/main.c
similarity index 100%
rename from demos/sdk/demousbhid/project/main.c
rename to demos/sdk/demousb/project/hid/main.c
diff --git a/demos/sdk/democanloopback/project/resources/mikrosdk.png b/demos/sdk/demousb/project/hid/resources/mikrosdk.png
similarity index 100%
rename from demos/sdk/democanloopback/project/resources/mikrosdk.png
rename to demos/sdk/demousb/project/hid/resources/mikrosdk.png
diff --git a/demos/sdk/demousbhid/project/usb_descriptors.c b/demos/sdk/demousb/project/hid/usb_descriptors.c
similarity index 100%
rename from demos/sdk/demousbhid/project/usb_descriptors.c
rename to demos/sdk/demousb/project/hid/usb_descriptors.c
diff --git a/demos/sdk/demousb/project/manifest.json b/demos/sdk/demousb/project/manifest.json
new file mode 100644
index 0000000..fed724a
--- /dev/null
+++ b/demos/sdk/demousb/project/manifest.json
@@ -0,0 +1,16 @@
+{
+    "contents": {
+        "clicks": [],
+        "examples": [
+            {
+                "path": "USB Demo Pack"
+            }
+        ]
+    },
+    "display_name": "USB Demo Pack",
+    "name": "mikroe.demo.sdk.usb.pack",
+    "type": "project",
+    "version": "3.0.0",
+    "demo": true,
+    "github_link": "https://github.com/MikroElektronika/necto_demos/tree/main/demos/sdk/demousb/project"
+}
diff --git a/demos/sdk/demousbmidi/project/CMakeLists.txt b/demos/sdk/demousb/project/midi/CMakeLists.txt
similarity index 100%
rename from demos/sdk/demousbmidi/project/CMakeLists.txt
rename to demos/sdk/demousb/project/midi/CMakeLists.txt
diff --git a/demos/sdk/demousbmidi/project/resources/details.md b/demos/sdk/demousb/project/midi/README.md
similarity index 100%
rename from demos/sdk/demousbmidi/project/resources/details.md
rename to demos/sdk/demousb/project/midi/README.md
diff --git a/demos/sdk/demousbmidi/project/resources/changelog.md b/demos/sdk/demousb/project/midi/changelog.md
similarity index 100%
rename from demos/sdk/demousbmidi/project/resources/changelog.md
rename to demos/sdk/demousb/project/midi/changelog.md
diff --git a/demos/sdk/demousbmidi/project/main.c b/demos/sdk/demousb/project/midi/main.c
similarity index 100%
rename from demos/sdk/demousbmidi/project/main.c
rename to demos/sdk/demousb/project/midi/main.c
diff --git a/demos/sdk/democanreceive/project/resources/mikrosdk.png b/demos/sdk/demousb/project/midi/resources/mikrosdk.png
similarity index 100%
rename from demos/sdk/democanreceive/project/resources/mikrosdk.png
rename to demos/sdk/demousb/project/midi/resources/mikrosdk.png
diff --git a/demos/sdk/demousbmidi/project/usb_descriptors.c b/demos/sdk/demousb/project/midi/usb_descriptors.c
similarity index 100%
rename from demos/sdk/demousbmidi/project/usb_descriptors.c
rename to demos/sdk/demousb/project/midi/usb_descriptors.c
diff --git a/demos/sdk/demousbcdc/project/manifest.json b/demos/sdk/demousbcdc/project/manifest.json
deleted file mode 100644
index 3b8bc07..0000000
--- a/demos/sdk/demousbcdc/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "USB CDC MSC Demo"
-            }
-        ]
-    },
-    "display_name": "USB CDC MSC Demo",
-    "name": "mikroe.demo.sdk.usbcdc",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demousbcdc/project/resources/mikrosdk.png b/demos/sdk/demousbcdc/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demousbcdc/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demousbhid/project/manifest.json b/demos/sdk/demousbhid/project/manifest.json
deleted file mode 100644
index bb12429..0000000
--- a/demos/sdk/demousbhid/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "USB HID Demo"
-            }
-        ]
-    },
-    "display_name": "USB HID Demo",
-    "name": "mikroe.demo.sdk.usbhiddemo",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demousbhid/project/resources/mikrosdk.png b/demos/sdk/demousbhid/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demousbhid/project/resources/mikrosdk.png and /dev/null differ
diff --git a/demos/sdk/demousbmidi/project/manifest.json b/demos/sdk/demousbmidi/project/manifest.json
deleted file mode 100644
index 206b70f..0000000
--- a/demos/sdk/demousbmidi/project/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "contents": {
-        "clicks": [],
-        "examples": [
-            {
-                "path": "USB-MIDI Demo"
-            }
-        ]
-    },
-    "display_name": "USB-MIDI Demo",
-    "name": "mikroe.demo.sdk.usbmidi",
-    "type": "project",
-    "version": "3.0.0"
-}
\ No newline at end of file
diff --git a/demos/sdk/demousbmidi/project/resources/mikrosdk.png b/demos/sdk/demousbmidi/project/resources/mikrosdk.png
deleted file mode 100644
index 7d15285..0000000
Binary files a/demos/sdk/demousbmidi/project/resources/mikrosdk.png and /dev/null differ
diff --git a/scripts/workflows/demos_upload.py b/scripts/workflows/demos_upload.py
index a599fa0..ea4f8d5 100644
--- a/scripts/workflows/demos_upload.py
+++ b/scripts/workflows/demos_upload.py
@@ -83,7 +83,7 @@ async def main(gh_instance, demos, args, upload_api):
                 )
             ),
             username = args.packer_username,
-            pasword = args.packer_password,
+            password = args.packer_password,
             url = args.packer_url
         )
 
@@ -123,7 +123,8 @@ def str2bool(v):
     utils.copy_files_and_folders(os.path.join(os.getcwd(), 'demos'), demo_dir)
 
     ## Add category to manifest if not present already
-    utils.manifests_add_category(demo_dir, 'NECTO Demo')
+    ## Should be handled automacially by NECTO at this point
+    # utils.manifests_add_category(demo_dir, 'NECTO Demo')
 
     ## If ever needed to convert legacy structured demos to new structure,
     ## this is an example call of the function.