diff --git a/README.md b/README.md
index 9b001a1..55f7f5b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 This repository hosts a collection of services for the SIO (Sighthound.IO) ecosystem. Services are intended to run via the `./scripts/sh-services` script, which relies on docker-compose. However, docker-compose is not strictly necessary for configuring or using this repository.
 
+![System architecture](docs/media/architecture.png)
+
 The included services are as follow:
 - SIO: The computer vision analytics engine.
 - MCP: Media manager service, which includes a REST API and a cleaner. MCP relies on sharing media store folders with SIO service, and listens on AMQP message bus for media creation events, such as new video recording segments or event-driven jpeg images. It then provides the API access to that media (for documentation go to http://localhost:9097), and control its lifecycle.
@@ -15,8 +17,15 @@ The `./scripts/sh-services` script is a basic tool that triggers `docker-compose
 
 In the turnkey scenario, each service is managed with an individual `docker-compose` configuration file, an optional (or autogenerated by sh-serviecs) `.env` file containing relevant environment variable, and a collection of service specific configuration file in conf subfolder. To assist in orchestrating the services collection and disjointed `docker-compose` and environment configuration, `sh-services` CLI utility was introduced.
 
+![Folder Structure](docs/media/folders.png)
+
 ## Configuration Priority:
 
+First, let's take a look on how the services work:
+
+![Folder Structure](docs/media/services.png)
+
+
 For example, if you have the following  configuration files:
  - default.env
  - 0009-customer.env
@@ -33,6 +42,8 @@ The first file is given the highest priority, so it will overwrite any conflicti
 
 This guide will help you set up SIO to point to a fake RTSP generated by live555 and start processing video.
 
+![live555](docs/media/live555.png)
+
 ### Prerequisites (for non-dnncam devices)
 On Sighthound DNNCam devices, services come preinstalled, and the device GUI interacts with it. If you are using a dnncam we suggest you rely on the GUI to configure/update services, though it's not a requirement. On other devices, you need to manually:
 
diff --git a/RELEASE.md b/RELEASE.md
index fe244a6..fb31973 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,4 +1,9 @@
 # Release Notes
 
+## v1.5.0
+- services: Migrate services to its own services path
+- README.md: Add visual documentation
+- examples: Add VideoStreamsConsumer integrated deployment sample
+
 ## v1.4.2
 - examples: Fixes issue with pip installation
diff --git a/VERSION b/VERSION
index c432e90..2e7bd91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.4.2
+v1.5.0
diff --git a/deployment-examples/ClientLib/lib/AMQPListener.py b/deployment-examples/ClientLib/lib/AMQPListener.py
new file mode 100644
index 0000000..650588a
--- /dev/null
+++ b/deployment-examples/ClientLib/lib/AMQPListener.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+import pika, json
+import traceback
+import socket
+
+class AMQPListener:
+    host = 'localhost'
+    exchange = 'anypipe'
+    routing_key = '#'
+    port = 5672
+
+    def __init__(self,conf):
+        self.queue_name = None
+        self.channel = None
+        self.connection = None
+        self.json_callback = None
+        self.host = conf.get("host", AMQPListener.host)
+        self.exchange = conf.get("exchange", AMQPListener.exchange)
+        self.routing_key = conf.get("routing_key", AMQPListener.routing_key)
+        self.port = conf.get("port", AMQPListener.port)
+        self.json_callback = lambda data: print(f"Received data {data}")
+
+    def set_callback(self, json_callback):
+        self.json_callback = json_callback
+
+    def connect(self):
+        if not self.connection:
+            self.connection = pika.BlockingConnection(
+                        pika.ConnectionParameters(host=self.host,port=self.port))
+            self.channel = self.connection.channel()
+
+            self.channel.exchange_declare(exchange=self.exchange, exchange_type='topic', durable=True)
+
+    def get_queue_name(self):
+        if not self.queue_name:
+            self.connect()
+            result = self.channel.queue_declare(queue='', exclusive=True)
+            self.queue_name = result.method.queue
+        print(f"Using queue name {self.queue_name}")
+        return self.queue_name
+
+    def callback(self,ch, method, properties, body):
+        try:
+            data = json.loads(body)
+            if self.json_callback:
+                self.json_callback(data)
+        except Exception as e:
+            print(f"Caught exception {e} handling callback")
+            traceback.print_exc()
+
+    def start(self):
+        """
+        Start the amqp listener, setting up a callback at @param json_callback
+        function with single argument representing a JSON payload.
+        """
+        print(f"Starting AMQP Listener on {self.host}:{self.port}")
+        try:
+            self.connect()
+        except socket.gaierror as e:
+            traceback.print_exc()
+            print(f"Error connecting to AMQP host: {self.host}:{self.port}. {e}.")
+            print("Please check your AMQP configuration. Did you start RabbitMQ?")
+            print("You can also use the environment variables AMQP_HOST and AMQP_PORT to configure the host and port.")
+            return
+        except Exception as e:
+            traceback.print_exc()
+            print(f"Caught exception '{e}' connecting to AMQP")
+            return
+        queue_name = self.get_queue_name()
+        self.channel.queue_bind(exchange=self.exchange, queue=queue_name,
+                                routing_key=self.routing_key)
+        self.channel.basic_consume(
+            queue=queue_name, on_message_callback=self.callback, auto_ack=True)
+        print(' [*] Listening for AMQP messages. To exit press CTRL+C')
+        self.channel.start_consuming()
+
+    def stop(self):
+        self.channel.stop_consuming()
diff --git a/deployment-examples/ClientLib/lib/MCP.py b/deployment-examples/ClientLib/lib/MCP.py
new file mode 100644
index 0000000..33672ae
--- /dev/null
+++ b/deployment-examples/ClientLib/lib/MCP.py
@@ -0,0 +1,162 @@
+import requests
+from PIL import Image
+import numpy as np
+from io import BytesIO
+
+class MCPClient:
+    def __init__(self, conf):
+        self.host = conf.get("host", "mcp")
+        self.port = conf.get("port", 9097)
+        self.user = conf.get("username", None)
+        self.password = conf.get("password", None)
+        if self.user and self.password:
+            print(f"Connecting to mcp://{self.user}:*****@{self.host}:{self.port}")
+        else:
+            print(f"Connecting to mcp://{self.host}:{self.port}")
+
+    def get(self, url):
+        if self.user and self.password:
+            auth = (self.user, self.password)
+        else:
+            auth = None
+        response = requests.get(url, auth=auth)
+
+        if response.status_code == 401:
+                raise Exception("Unauthorized")
+        else:
+            return response
+
+    # curl mcp:9097/hlsfs/source
+    def list_sources(self):
+        url = f"http://{self.host}:{self.port}/hlsfs/source"
+        return self.get(url).json()
+
+    # curl mcp:9097/hlsfs/source/<source_id>/stats
+    def get_stats(self, source_id):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/stats"
+        return self.get(url).json()
+
+    # curl mcp:9097/hlsfs/source/<source_id>/image/<image>
+    def get_image(self, source_id, image):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/image/{image}"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("Image not found")
+            else:
+                raise Exception("Error downloading image", response.status_code)
+        else:
+            # Convert image to numpy array
+            img = Image.open(BytesIO(response.content))
+            arr = np.array(img)
+            return arr
+
+    # curl mcp:9097/hlsfs/source/<source_id>/segment/<video>
+    def download_video(self, source_id, video, filepath):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/segment/{video}"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception(f"Video {video} not found for source {source_id}")
+            else:
+                raise Exception(f"Error downloading video {video} to {filepath} for source {source_id}", response.status_code)
+        else:
+            # Save image to file
+            with open(filepath, 'wb') as f:
+                f.write(response.content)
+
+    # curl mcp:9097/hlsfs/source/<source_id>/segment/<segment>
+    def get_segment(self, source_id, segment):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/segment/{segment}"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("Segment not found")
+            else:
+                raise Exception("Error downloading Segment", response.status_code)
+        else:
+            return BytesIO(response.content)
+
+    # curl mcp:9097/hlsfs/source/<source_id>/segment/<image>
+    def download_image(self, source_id, image, filepath):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/segment/{image}"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("Image not found")
+            else:
+                raise Exception("Error downloading image", response.status_code)
+        else:
+            # Save image to file
+            with open(filepath, 'wb') as f:
+                f.write(response.content)
+
+    # curl mcp:9097/hlsfs/source/<source_id>/image
+    def list_images(self, source_id):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/image"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("Image not found")
+            else:
+                raise Exception("Error downloading image", response.status_code)
+        else:
+            return response.json()
+
+    # curl mcp:9097/hlsfs/source/<source_id>/latest-image
+    def get_latest_image(self, source_id):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/latest-image"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("Image not found")
+            else:
+                raise Exception("Error downloading image", response.status_code)
+        else:
+            # Convert image to numpy array
+            img = Image.open(BytesIO(response.content))
+            arr = np.array(img)
+            return arr
+
+    # curl mcp:9097/hlsfs/source/<source_id>/live
+    def get_live_m3u8(self, source_id):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/live"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("M3U8 not found")
+            else:
+                raise Exception("Error downloading HLS", response.status_code)
+        else:
+            return response.text
+
+    # curl mcp:9097/hlsfs/source/<source_id>/<start>..<end>.m3u8
+    def get_m3u8(self, source_id, start, end):
+        url = f"http://{self.host}:{self.port}/hlsfs/source/{source_id}/{start}..{end}.m3u8"
+        response = self.get(url)
+
+        if response.status_code != 200:
+            if response.status_code == 404:
+                raise Exception("M3U8 not found:", url)
+            else:
+                raise Exception("Error downloading HLS:", url, ":", response.status_code)
+        else:
+            return response.text
+        
+    # curl mcp:9097/hlsfs/source/<source_id>/<start>..<end>.m3u8
+    def get_m3u8_playlist(self, source_id, start, end):
+        import m3u8
+        m3u8_content = self.get_m3u8(source_id, start, end)
+        # Remove all #EXT-UNIX-TIMESTAMP-MS lines from the m3u8 file
+        # m3u8 library doesn't support this tag
+        m3u8_content = '\n'.join([line for line in m3u8_content.split('\n') if not line.startswith("#EXT-UNIX-TIMESTAMP-MS")])
+        return m3u8.loads(m3u8_content)
+
+
diff --git a/deployment-examples/ClientLib/lib/SIODrawer.py b/deployment-examples/ClientLib/lib/SIODrawer.py
new file mode 100644
index 0000000..164071f
--- /dev/null
+++ b/deployment-examples/ClientLib/lib/SIODrawer.py
@@ -0,0 +1,155 @@
+import traceback
+import cv2
+import numpy as np
+
+class SIODrawer:
+    def __init__(self, mcp=None, stream_factory=None):
+        self.stream_factory = stream_factory
+        self.mcp = mcp
+        self.last_sequence = 0
+        self.frame = None
+
+    def set_current_frame(self, frame):
+        self.frame = frame
+
+    def clear_frame(self, color=None):
+        if color is not None:
+            self.frame = np.full((self.height, self.width, self.channels), color, np.uint8)
+        else:
+            self.frame = np.zeros((self.height, self.width, self.channels), np.uint8)
+
+    def save_frame(self, filename):
+        cv2.imwrite(filename, self.frame)
+
+    def draw_a_circle(self):
+        # Calculate the center point of the image
+        center = (int(self.width/2), int(self.height/2))
+        # Draw a circle at the center point
+        radius = 50
+        color = (0, 0, 255) # BGR format
+        thickness = 2
+        cv2.circle(self.frame, center, radius, color, thickness)
+
+    def draw_rectangle(self, x, y, w, h, title=None, color = (0, 255, 0)):
+        # Draw a rectangle
+        cv2.rectangle(self.frame, (x, y), (x+w, y+h), color, 2)
+        # Draw a title
+        if title != None:
+            cv2.putText(self.frame, title, (x, y-5), cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2)
+
+    def write_text(self, text, location="top_left", color=(0, 255, 0), font_scale=1, thickness=2):
+        if location == "bottom_left":
+            x = 10
+            y = self.height - 10
+        elif location == "top_left":
+            x = 10
+            y = 30
+        elif location == "center":
+            str_len = len(text)
+            x = int(self.width / 2) - (str_len * font_scale * 10 )
+            y = int(self.height / 2)
+        else:
+            print("Invalid location. Using top_left")
+            x = 10
+            y = 30
+        cv2.putText(self.frame, text, (x, y), cv2.FONT_HERSHEY_SIMPLEX, font_scale, color, thickness)
+
+    def draw_sio_data(self, data):
+        self.write_text(str(data.get("frameTimestamp", 0)), "top_left")
+            
+        # Draw objects
+        # 'vehicles': {'my-video-car-386-1677705751799': {'class': 'car', 'firstFrameTimestamp': 1677706299912, 'bestDetectionTimestamp': 1677706299912, 'box': {'x': 1136, 'y': 315, 'width': 141, 'height': 129}, 'detectionScore': 0.77, 'updated': True}}
+        for _metaClass, _classes in data.get("metaClasses", {}).items():
+            # 'my-video-car-386-1677705751799': {'class': 'car', 'firstFrameTimestamp': 1677706299912, 'bestDetectionTimestamp': 1677706299912, 'box': {'x': 1136, 'y': 315, 'width': 141, 'height': 129}, 'detectionScore': 0.77, 'updated': True}
+            for object_id, _object in _classes.items():
+                # 'box': {'x': 1136, 'y': 315, 'width': 141, 'height': 129}
+                box = _object.get("box", {})
+                x = box.get("x", 0)
+                y = box.get("y", 0)
+                w = box.get("width", 0)
+                h = box.get("height", 0)
+                green = (0, 255, 0)
+                self.draw_rectangle(x, y, w, h, title=object_id, color=green)
+
+    def draw_sio_data_to_video(self, data, source, dest):
+        # Get the time
+        last_message = data[-1]
+        startTs = 0
+        endTs = 0
+        for events in last_message.get("mediaEvents", 0):
+            if events.get("type") == "video_file_closed":
+                startTs = events.get("startTs", 0)
+                endTs = events.get("endTs", 0)
+
+        # Open the video file
+        cap = cv2.VideoCapture(source)
+        # Get the video width and height
+        self.width = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
+        self.height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
+
+        # Define the output video file
+        out = cv2.VideoWriter(dest+".mp4", cv2.VideoWriter_fourcc(*'mp4v'), 30, (self.width, self.height))
+        while cap.isOpened():
+            # Read a frame from the video
+            ret, self.frame = cap.read()
+
+            if ret:
+                # Get the current position in milliseconds
+                pos_msec = startTs + cap.get(cv2.CAP_PROP_POS_MSEC)
+                
+                # self.write_text(str(pos_msec), "bottom_left")
+
+                # Draw objects
+                message_found = False
+                for message in data:
+                    # Frame timestamp between now and 200ms after the current frame
+                    if message.get("frameTimestamp", 0) >= pos_msec and message.get("frameTimestamp", 0) < pos_msec + 200:
+                        message_found = True
+                        self.draw_sio_data(message)
+                        break
+                if not message_found:
+                    self.write_text("No message found", "center")
+
+
+                # Write the frame to the output video file
+                out.write(self.frame)
+            else:
+                break
+
+        # Release the video capture and writer objects
+        cap.release()
+        out.release()
+
+    def stream_callback(self, data):
+        try:
+            if "frameDimensions" in data:
+                self.stream_factory.set_frame_size(data["frameDimensions"]["w"], data["frameDimensions"]["h"])
+            
+            # Draw image
+            image_found = None
+            source_id = data.get("sourceId", None)
+            # [{'type': 'image', 'msg': '16777/1677706254368.jpg', 'format': 'jpg', 'sequence': 360}]
+            for event in data.get("mediaEvents", []):
+                if event.get("type") == "image":
+                    if event.get("sequence") <= self.last_sequence:
+                        continue
+                    image_found = event.get("msg")
+                    self.last_sequence = event.get("sequence")
+                    break
+            if image_found:
+                try:
+                    self.set_current_frame(self.mcp.get_image(source_id, image_found))
+                except Exception as e:
+                    print(f"Caught exception {e}")
+            else:
+                return
+            
+            self.draw_sio_data(data)
+            
+            self.stream_factory.set_current_frame(self.frame)
+
+        except Exception as e:
+            print(f"Caught exception {e} handling sio callback")
+            traceback.print_exc()
+        else:
+            self.stream_factory.update_frame()
\ No newline at end of file
diff --git a/deployment-examples/README.md b/deployment-examples/README.md
index 40a5b0a..fea9926 100644
--- a/deployment-examples/README.md
+++ b/deployment-examples/README.md
@@ -1,3 +1,10 @@
 # Deployment examples
 
-Sample deployments in this folder demonstrate how to accomplish specific tasks using Sighthound utilities without the overhead of managed `services`, with only standard Docker tools and commands at user's disposal.
\ No newline at end of file
+Sample deployments in this folder demonstrate how to accomplish specific tasks using Sighthound utilities without the overhead of managed `services`, with only standard Docker tools and commands at user's disposal.
+
+The following samples are available:
+
+* `ClientLib` - a collection of Python classes to use as base for sample client apps, and shell scripts for running those apps
+* `SighthoundRestApiGateway` - a deployment in which `VehicleAnalytics` pipeline is deployed with a REST API gateway in front of it, enabling image annotation API, with an optional UI front end.
+* `VideoStreamsConsumer` - a deployment in which `VehicleAnalytics` pipeline consumes multiple video streams from live RTSP sources, and emits analytics output to AMQP broker deployed locally.
+* `VideoStreamsRecorder` - similar to `VideoStreamConsumer`, but also generates video recordings and images as part of its analytics output. `MCP` service is deployed for providing access to and managing the generated media
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/README.md b/deployment-examples/VideoStreamsConsumer/README.md
new file mode 100644
index 0000000..9d2b4ca
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/README.md
@@ -0,0 +1,37 @@
+# Sighthound Vehicle Analytics - RTSP Client
+
+This sample illustrates a deployment of Sighthound Vehicle Analytics pipeline analyzing multiple RTSP sources. As configured, it consumes RTSP video from two sources, analyzes it, and emits the analytics to AMQP queue. This example does not generate or store any media.
+
+This deployment is comprised of 3 services: SIO's [Vehicle Analytics](https://dev.sighthound.com/sio/pipelines/VehicleAnalytics/), AMQP broker and an optional RTSP stream provider.
+
+Contact [support@sighthound.com](mailto:support@sighthound.com) with any questions, and visit our [Developer Portal](https://dev.sighthound.com/cloud-api/docs/quickstart/docker/) for more information.
+
+
+## Configuration
+
+* Most of the relevant configuration, and the entire set of pipeline parameters (including RTSP URIs) is specified in `./config/analytics/pipelines.json`. This file is referenced directly by `docker-compose.yml`'s entrypoint.
+* RabbitMQ configuration is available in `./config/rabbitmq` - please do not use it for your production deployment, and ensure that whatever you do use satisfies your network and security requirements.
+
+## Running the sample deployment
+
+Before getting started, you must copy your `sighthound-license.json` into the `./VideoStreamConsumer/config/` folder. If you do not have a license, please contact [support@sighthound.com](mailto:support@sighthound.com).
+
+Next, open a terminal, `cd` into the `./VideoStreamConsumer/` folder, and run the following command to start the services:
+
+```bash
+docker compose up -d
+```
+
+If you have an NVIDIA GPU installed and properly configured, you can run the following command instead to enable GPU acceleration:
+
+```bash
+SIO_DOCKER_RUNTIME=nvidia docker compose up -d
+```
+
+## Running the client sample
+
+Once the services are up and running, start the client sample with a `docker compose up` command while inside the relevant sample's folder in `./clients/python/`.
+
+The following client samples are available for this deployment:
+
+* `SIOOutput` - simple AMQP client listening for and consuming SIO output from the message queue
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/Dockerfile b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/Dockerfile
new file mode 100644
index 0000000..6cb0a4a
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.8
+
+WORKDIR /usr/src/app
+COPY requirements.txt /usr/src/app/
+RUN pip3 install -r requirements.txt
+
+ENV PYTHONPATH=${PYTHONPATH}:/usr/src/app:/usr/src/app/lib
+ENV PYTHONUNBUFFERED=1
+
+ENTRYPOINT [ "python3", "/usr/src/app/main.py" ]
diff --git a/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/SIO.py b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/SIO.py
new file mode 100644
index 0000000..9f0c7b0
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/SIO.py
@@ -0,0 +1,41 @@
+import traceback
+import time
+
+class SIO:
+    def __init__(self) -> None:
+        pass
+    def callback(self, message):
+        try:
+            sourceId = message.get("sourceId", "unknown")
+            frameId = message.get("frameId", "unknown")
+            analyticsTimestamp = message.get("analyticsTimestamp",0)
+            timestamp_str = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(analyticsTimestamp/1000))
+            output = f"Message from source: {sourceId} frame: {frameId} at {timestamp_str}\n"
+            
+            metaclasses = message.get("metaClasses", {})
+            if metaclasses:
+                output += " With objects:\n"
+            for metaclass, objects in metaclasses.items():
+                for object_id, object in objects.items():
+                    object_class = object.get("class", "unknown")
+                    box = object.get("box", {})
+                    x = box.get("x", -1)
+                    y = box.get("y", -1)
+                    output += f"  - {metaclass}:{object_class} ({object_id})  at ({x},{y})\n"
+
+            mediaEvents = message.get("mediaEvents", {})
+            if mediaEvents:
+                output += " With media events:\n"
+            for event in mediaEvents:
+                    type = event.get("type", "unknown")
+                    sequence = event.get("sequence", -1)
+                    output += f"  - {type} ({sequence})\n"
+
+            output += "---------------\n"
+            print(output)
+            
+            
+        except Exception as e:
+            print(f"Caught exception {e} handling callback")
+            traceback.print_exc()
+            
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/docker-compose.yml b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/docker-compose.yml
new file mode 100644
index 0000000..7df6b6b
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.7'
+services:
+  example-sio-output:
+    build: .
+    container_name: example-sio-output
+    restart: no
+    network_mode: host
+    environment:
+      # Configure the application
+      - AMQP_HOST=localhost
+      - AMQP_PORT=5672
+    volumes:
+      - .:/usr/src/app
+      # Make sure basic building blocks are on PYTHONPATH
+      - ../../../../ClientLib/lib:/usr/src/app/lib
diff --git a/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/main.py b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/main.py
new file mode 100644
index 0000000..8c14400
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/main.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+import AMQPListener as amqp
+from SIO import SIO
+import os
+
+def get_args():
+    amqp_conf = {}
+    amqp_conf["host"] = os.environ.get("AMQP_HOST", "localhost")
+    amqp_conf["port"] = os.environ.get("AMQP_PORT", 5672)
+    amqp_conf["exchange"] = os.environ.get("AMQP_EXCHANGE", "sio")
+    amqp_conf["routing_key"] = os.environ.get("AMQP_ROUTING_KEY", "*")
+    print ("AMQP configuration:", amqp_conf)
+    return amqp_conf
+
+def main():
+    # getting the required information from the user
+    amqp_conf = get_args()
+    # Create an AMQP listener
+    amqp_listener = amqp.AMQPListener(amqp_conf)
+    # Register the callback
+    sio = SIO()
+    amqp_listener.set_callback(sio.callback)
+    amqp_listener.start()
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/requirements.txt b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/requirements.txt
new file mode 100644
index 0000000..dab88a8
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/clients/python/SIOOutput/requirements.txt
@@ -0,0 +1,3 @@
+pika >= 1.3.1
+shapely >= 1.8.5
+requests >= 2.26.0
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/config/analytics/boxFilter.json b/deployment-examples/VideoStreamsConsumer/config/analytics/boxFilter.json
new file mode 100644
index 0000000..1dfb6e4
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/config/analytics/boxFilter.json
@@ -0,0 +1,20 @@
+[
+    {
+      "name": "plateBike_SizeFilter",
+      "type": "size",
+      "subtype": "dimension",
+      "max": 0,
+      "min": 10,
+      "classes": ["licenseplate", "motorbike"],
+      "debug": false
+    },
+    {
+      "name": "vehicle_SizeFilter",
+      "type": "size",
+      "subtype": "dimension",
+      "max": 0,
+      "min": 15,
+      "classes": ["car", "bus", "truck"],
+      "debug": false
+    }
+  ]
diff --git a/deployment-examples/VideoStreamsConsumer/config/analytics/extension.py b/deployment-examples/VideoStreamsConsumer/config/analytics/extension.py
new file mode 100644
index 0000000..2cf453d
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/config/analytics/extension.py
@@ -0,0 +1,37 @@
+#
+# Sample SIO pipeline extension
+#
+
+import sys
+import os
+import json
+
+class SIOPlugin:
+  def __init__(self):
+    print(f"Creating SIO extension")
+    self.prefix = "unknown"
+
+  # Prepare the module using provided configuration
+  def configure(self, configJsonPath):
+    try:
+      with open(configJsonPath) as configJsonFile:
+          config = json.load(configJsonFile)
+      self.prefix = config["prefix"]
+    except:
+      print(f"Failed to load extension module configuration from {configJsonPath}")
+      raise
+
+  # Process the output
+  def process(self, tick, frameData, frame):
+    # This extension doesn't do much, just logging the analytics. However, you could
+    # implement an egress method alternative to AMQP, additional filtering of the results,
+    # modifying the resulting JSON, annotating the images etc.
+    # Just remember not to block -- or not to spend too much time -- here.
+    print(f"{self.prefix} - {tick} - {frameData}")
+
+    # always return the (potentially filtered or modified) output
+    return frameData
+
+  # Finalize the module
+  def finalize(self):
+    print(f"{self.prefix} - Pipeline completed")
diff --git a/amqp-stats/conf/custom.env b/deployment-examples/VideoStreamsConsumer/config/analytics/extensionConfig1.json
similarity index 100%
rename from amqp-stats/conf/custom.env
rename to deployment-examples/VideoStreamsConsumer/config/analytics/extensionConfig1.json
diff --git a/deployment-examples/VideoStreamsConsumer/config/analytics/extensionConfig2.json b/deployment-examples/VideoStreamsConsumer/config/analytics/extensionConfig2.json
new file mode 100644
index 0000000..d3461f2
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/config/analytics/extensionConfig2.json
@@ -0,0 +1,3 @@
+{
+    "prefix" : "source-2"
+}
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsConsumer/config/analytics/pipelines.json b/deployment-examples/VideoStreamsConsumer/config/analytics/pipelines.json
new file mode 100644
index 0000000..08d4137
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/config/analytics/pipelines.json
@@ -0,0 +1,48 @@
+{
+    "stream1" : {
+        "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
+        "restartPolicy" : "restart",
+        "parameters" : {
+            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo1.mkv",
+            "boxFilterConfig" : "/config/analytics/boxFilter.json",
+            "detectionModel" : "gen6es",
+            "lptModel" : "gen5ss",
+            "lptFilter" : "['eu', 'us']",
+            "lptMinConfidence" : "0.5",
+            "sourceId" : "rtsp-stream-1",
+            "lptPreferAccuracyToSpeed" : "false",
+            "amqpHost" : "rabbitmq_svc",
+            "amqpPort" : "5672",
+            "amqpUser" : "guest",
+            "amqpPassword" : "guest",
+            "amqpExchange" : "sio",
+            "amqpRoutingKey" : "sio",
+            "amqpErrorOnFailure" : "true",
+            "extensionModules" : "/config/analytics/extension.py",
+            "extensionConfigurations" : "/config/analytics/extensionConfig1.json"
+        }
+    },
+    "stream2" : {
+        "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
+        "restartPolicy" : "restart",
+        "parameters" : {
+            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo2.mkv",
+            "boxFilterConfig" : "/config/analytics/boxFilter.json",
+            "detectionModel" : "gen6es",
+            "lptModel" : "gen5ss",
+            "lptFilter" : "['eu', 'us']",
+            "lptMinConfidence" : "0.5",
+            "sourceId" : "rtsp-stream-2",
+            "lptPreferAccuracyToSpeed" : "false",
+            "amqpHost" : "rabbitmq_svc",
+            "amqpPort" : "5672",
+            "amqpUser" : "guest",
+            "amqpPassword" : "guest",
+            "amqpExchange" : "sio",
+            "amqpRoutingKey" : "sio",
+            "amqpErrorOnFailure" : "true",
+            "extensionModules" : "/config/analytics/extension.py",
+            "extensionConfigurations" : "/config/analytics/extensionConfig2.json"
+        }
+    }
+}
diff --git a/deployment-examples/VideoStreamsConsumer/config/rabbitmq/definitions.json b/deployment-examples/VideoStreamsConsumer/config/rabbitmq/definitions.json
new file mode 100644
index 0000000..983e765
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/config/rabbitmq/definitions.json
@@ -0,0 +1,60 @@
+{
+    "rabbit_version": "3.8.20",
+    "rabbitmq_version": "3.8.20",
+    "product_name": "RabbitMQ",
+    "product_version": "3.8.20",
+    "users": [
+      {
+        "name": "guest",
+        "password_hash": "YMmuH8796TNxLiwksKPOEfaI4usEoH1lYsdYzhcYXQq5wMlD",
+        "hashing_algorithm": "rabbit_password_hashing_sha256",
+        "tags": "administrator",
+        "limits": {}
+      }
+    ],
+    "vhosts": [
+      {
+        "name": "/"
+      }
+    ],
+    "permissions": [
+      {
+        "user": "guest",
+        "vhost": "/",
+        "configure": ".",
+        "write": ".",
+        "read": ".*"
+      }
+    ],
+    "topic_permissions": [],
+    "parameters": [],
+    "global_parameters": [
+      {
+        "name": "internal_cluster_id",
+        "value": "rabbitmq-cluster-id-C82kbG-3JTiyYVyQdMbW0g"
+      }
+    ],
+    "policies": [],
+    "queues": [],
+    "exchanges": [
+      {
+        "name": "sio",
+        "vhost": "/",
+        "type": "topic",
+        "durable": true,
+        "auto_delete": false,
+        "internal": false,
+        "arguments": { "expires" : 60000 }
+      },
+      {
+        "name": "aqueduct",
+        "vhost": "/",
+        "type": "topic",
+        "durable": true,
+        "auto_delete": false,
+        "internal": false,
+        "arguments": { "expires" : 60000 }
+      }
+    ],
+    "bindings": []
+  }
\ No newline at end of file
diff --git a/rabbitmq/conf/rabbitmq.conf b/deployment-examples/VideoStreamsConsumer/config/rabbitmq/rabbitmq.conf
similarity index 100%
rename from rabbitmq/conf/rabbitmq.conf
rename to deployment-examples/VideoStreamsConsumer/config/rabbitmq/rabbitmq.conf
diff --git a/deployment-examples/VideoStreamsConsumer/docker-compose.yml b/deployment-examples/VideoStreamsConsumer/docker-compose.yml
new file mode 100644
index 0000000..8bcf18b
--- /dev/null
+++ b/deployment-examples/VideoStreamsConsumer/docker-compose.yml
@@ -0,0 +1,63 @@
+version: "3"
+services:
+
+  # By default pipelines.json will point to streams served by this container.
+  # If you point to your own cameras or streams, this container has no other
+  # function and can be disabled.
+  live555_svc:
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/live555:latest
+    container_name: sample-live555
+    restart: unless-stopped
+    ports:
+      - "8554:554"
+
+  # AMQP broker to receive analytics data
+  rabbitmq_svc:
+    image: docker.io/rabbitmq:3.8-management
+    container_name: sample-rabbitmq
+    restart: unless-stopped
+    volumes:
+      - ./config/rabbitmq/definitions.json:/etc/rabbitmq/definitions.json
+      - ./config/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+      - rabbitmq_persistent_storage:/var/lib/rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
+      timeout: 30s
+      retries: 3
+
+  # The SIO analytics container, consuming the streams and analyzing them
+  analytics_svc:
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/sio:r230908
+    container_name: sample-sio
+    restart: unless-stopped
+    environment:
+      # Location where SIO will place generated model engine files
+      - SIO_DATA_DIR=/data/sio-cache
+    # Container runtime defaults to `runc` if SIO_DOCKER_RUNTIME not set. Use `nvidia` if GPU is installed.
+    runtime: ${SIO_DOCKER_RUNTIME-runc}
+    volumes:
+      # Read-only shared folder for data exchange with host / other containers.
+      # We'll use it for license, config files, etc.
+      - ./config:/config:ro
+      # Writable shared folder for data exchange with host / other containers.
+      # We'll use it for storing the generated model files, data exchange folder, etc.
+      - ./data:/data
+    entrypoint:
+      - /sighthound/sio/bin/runPipelineSet
+      # Pipeline configuration file
+      - /config/analytics/pipelines.json
+      # License at the path accessible in the container
+      - --license-path=/config/sighthound-license.json
+      # Log level (info, debug, trace)
+      - --log=${SIO_LOG_LEVEL-info}
+    depends_on:
+      # This dependency can be removed with live555 if no longer necessary.
+      - live555_svc
+      - rabbitmq_svc
+
+volumes:
+  rabbitmq_persistent_storage:
diff --git a/deployment-examples/VideoStreamsRecorder/README.md b/deployment-examples/VideoStreamsRecorder/README.md
new file mode 100644
index 0000000..666f574
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/README.md
@@ -0,0 +1,41 @@
+# Sighthound Vehicle Analytics - RTSP Client generating media output
+
+This sample continues where `VideoStreamConsumer` left off, and adds on media generation by SIO analytics service, with addition of MCP (Media Control Proxy) service for providing media access API and lifecycle managment.
+
+This deployment is comprised of 4 services: SIO's [Vehicle Analytics](https://dev.sighthound.com/sio/pipelines/VehicleAnalytics/), AMQP broker, MCP and an optional RTSP stream provider.
+
+Contact [support@sighthound.com](mailto:support@sighthound.com) with any questions, and visit our [Developer Portal](https://dev.sighthound.com/cloud-api/docs/quickstart/docker/) for more information.
+
+
+## Configuration
+
+* Most of the relevant configuration, and the entire set of pipeline parameters (including RTSP URIs) is specified in `./config/analytics/pipelines.json`. This file is referenced directly by `docker-compose.yml`'s entrypoint.
+* RabbitMQ configuration is available in `./config/rabbitmq` - please do not use it for your production deployment, and ensure that whatever you do use satisfies your network and security requirements.
+* The media lifecycle is driven by the configuration in `./config/mcp/mcp.yml`. With configuration specified, older media items will be removed once total size of items generated reaches `2GB`. It is important that RabbitMQ configuration (including exchange and routing key), match those specified for `sio`, otherwise MCP won't be aware of media items being created.
+
+## Running the sample deployment
+
+Before getting started, you must copy your `sighthound-license.json` into the `./VideoStreamRecorder/config/` folder. If you do not have a license, please contact [support@sighthound.com](mailto:support@sighthound.com).
+
+Next, open a terminal, `cd` into the `./VideoStreamRecorder/` folder, and run the following command to start the services:
+
+```bash
+docker compose up -d
+```
+
+If you have an NVIDIA GPU installed and properly configured, you can run the following command instead to enable GPU acceleration:
+
+```bash
+SIO_DOCKER_RUNTIME=nvidia docker compose up -d
+```
+
+Or if you have an NVIDIA Tegra device properly configured (e/g DNNcam), you can run the following command instead to enable GPU acceleration:
+
+```bash
+SIO_DOCKER_RUNTIME=nvidia SIO_DOCKER_TAG_VARIANT="-r32.7.3-arm64v8" docker-compose up -d
+```
+
+## Running the client samples
+
+Once the services are up and running, start the client sample with a `docker compose up` command while inside the relevant sample's folder in `./clients/python/`
+
diff --git a/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/Dockerfile b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/Dockerfile
new file mode 100644
index 0000000..346f8ae
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:3.8
+
+RUN apt update && apt install -y curl libgl1-mesa-glx
+
+WORKDIR /usr/src/app
+COPY requirements.txt /usr/src/app/
+RUN pip3 install -r requirements.txt
+
+ENV PYTHONPATH=${PYTHONPATH}:/usr/src/app:/usr/src/app/lib
+
+ENV PYTHONUNBUFFERED=1
+
+ENTRYPOINT [ "python3", "/usr/src/app/main.py" ]
diff --git a/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/SIO.py b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/SIO.py
new file mode 100644
index 0000000..4693e82
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/SIO.py
@@ -0,0 +1,153 @@
+import traceback
+import time
+import os
+
+class SIO:
+    def __init__(self, mcp_client, sio_drawer) -> None:
+        self.mcp_client = mcp_client
+        self.sio_drawer = sio_drawer
+        self.seenLps = {}
+        self.seenVehicles = {}
+        self.memoryDepth = 10000
+
+    # -------------------------------------------------------------------------------
+    # Get box object
+    # -------------------------------------------------------------------------------
+    def getBox(self, obj):
+        try:
+            boxObj = obj["box"]
+            box = [ boxObj["x"], boxObj["y"], boxObj["width"], boxObj["height"] ]
+        except:
+            box = [ 0, 0, 0, 0 ]
+        return box
+
+    # -------------------------------------------------------------------------------
+    # Get object ID linked to the curent object
+    # -------------------------------------------------------------------------------
+    def getLinkedObjectId(self, obj, desiredObjType):
+        id = None
+        for link in obj.get("links", {}):
+            if link.get("metaClass", None) == desiredObjType:
+                id = link.get("id", None)
+            if not id is None:
+                break
+        return id
+
+    # -------------------------------------------------------------------------------
+    # Get LP attributes
+    # -------------------------------------------------------------------------------
+    def getLPInfo(self, lps, lpKey):
+        lp = lps[lpKey]
+        lpString = lp.get("attributes", {}).get("lpString", {}).get("value", {})
+        lpRegion = lp.get("attributes", {}).get("lpRegion", {}).get("value", {})
+        lpBox = self.getBox(lp)
+
+        # Find the linked vehicle, if any
+        vehicleId = self.getLinkedObjectId(lp, "vehicles")
+
+        return lpString, lpRegion, lpBox, vehicleId
+
+    # -------------------------------------------------------------------------------
+    # Get vehicle attributes
+    # -------------------------------------------------------------------------------
+    def getVehicleInfo(self, vehicles, vehicleId):
+        vehicle = vehicles.get(vehicleId, {})
+        makeModel = vehicle.get("attributes", {}).get("vehicleType", {}).get("value", "unknownMakeModel")
+        color = vehicle.get("attributes", {}).get("color", {}).get("value", "unknownColor")
+        vehicleBox = self.getBox(vehicle)
+        return makeModel, color, vehicleBox
+
+    # -------------------------------------------------------------------------------
+    def cleanupMemory(self, currentTs):
+        for key in list(self.seenLps.keys()):
+            if currentTs - self.seenLps[key] > self.memoryDepth:
+                del self.seenLps[key]
+        for key in list(self.seenVehicles.keys()):
+            if currentTs - self.seenVehicles[key] > self.memoryDepth:
+                del self.seenVehicles[key]
+
+    # -------------------------------------------------------------------------------
+    # Get image ID associated with current message or None
+    # -------------------------------------------------------------------------------
+    def getFrameImageID(self, message):
+        mediaEvents = message.get("mediaEvents", {})
+        for event in mediaEvents:
+            if event.get("type", None) == "image":
+                return event.get("msg", None)
+        return None
+
+    # -------------------------------------------------------------------------------
+    # Get image associated with current message or None
+    # -------------------------------------------------------------------------------
+    def getFrameImage(self, sourceId, message):
+        image = None
+        imageId = ""
+        try:
+            imageId = self.getFrameImageID(message)
+            if imageId:
+                image = self.mcp_client.get_image(sourceId, imageId)
+        except Exception as e:
+            print(f"Caught exception {e} handling callback with message {str(message)}")
+            traceback.print_exc()
+
+        return image
+
+    # -------------------------------------------------------------------------------
+    def parseSIOMessage(self, message):
+        sourceId = message.get("sourceId", "unknown")
+        frameTimestamp = message.get("frameTimestamp",0)
+        frameTimestampValue = int(frameTimestamp)
+        timestamp_str = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(frameTimestamp/1000))
+        # print (f"Received message from source {sourceId} at {timestamp_str}")
+
+        mc = message.get("metaClasses", {})
+        lps = mc.get("licensePlates", {})
+        vehicles = mc.get("vehicles", {})
+        processedVehicles = []
+
+        # Get image associated with the frame (this isn't guaranteed)
+        frameImage = self.getFrameImage(sourceId, message)
+
+        # Process license plates
+        for lpKey in lps.keys():
+            status = "Got"
+            if lpKey in self.seenLps:
+                status = "Improved"
+            self.seenLps[lpKey] = frameTimestampValue
+
+            lpString, lpRegion, lpBox, vehicleId = self.getLPInfo(lps, lpKey)
+
+            # Process vehicle associated with LP (if found)
+            if vehicleId:
+                makeModel, color, vehicleBox = self.getVehicleInfo(vehicles, vehicleId)
+                if vehicleId in self.seenVehicles:
+                    status = "Improved"
+                self.seenVehicles[vehicleId] = frameTimestampValue
+                processedVehicles.append(vehicleId)
+                print(f"{timestamp_str} - [{sourceId}] {status} {color} {makeModel} at {str(vehicleBox)} with LP {lpString} - {lpRegion}")
+            else:
+                print(f"{timestamp_str} - [{sourceId}] {status} LP: {lpString} - {lpRegion} at {str(lpBox)}")
+
+        # Process those vehicles without associated license plates
+        for vehicleId in vehicles.keys():
+            lpId = self.getLinkedObjectId(vehicles.get(vehicleId,{}), "licensePlates")
+            if lpId is None:
+                # No link to an LP
+                status = "Got"
+                if vehicleId in self.seenVehicles:
+                    status = "Improved"
+                self.seenVehicles[vehicleId] = frameTimestampValue
+                makeModel, color, vehicleBox = self.getVehicleInfo(vehicles, vehicleId)
+                print(f"{timestamp_str} - [{sourceId}] {status} {color} {makeModel} at {str(vehicleBox)}")
+
+        # TODO: demonstrate crops creation from the image we retrieved
+
+        self.cleanupMemory(frameTimestampValue)
+
+    # -------------------------------------------------------------------------------
+    def callback(self, message):
+        try:
+            self.parseSIOMessage(message)
+        except Exception as e:
+            print(f"Caught exception {e} handling callback with message {str(message)}")
+            traceback.print_exc()
diff --git a/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/docker-compose.yml b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/docker-compose.yml
new file mode 100644
index 0000000..c10f650
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.7'
+services:
+  example-sio-output-processor:
+    build: .
+    container_name: example-sio-output-processor
+    restart: no
+    network_mode: host
+    environment:
+      # Configure the application
+      - AMQP_HOST=localhost
+      - AMQP_PORT=5672
+    volumes:
+      - .:/usr/src/app
+      # Make sure basic building blocks are on PYTHONPATH
+      - ../../../../ClientLib/lib:/usr/src/app/lib
diff --git a/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/main.py b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/main.py
new file mode 100644
index 0000000..e9d6f42
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/main.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+import AMQPListener as amqp
+from MCP import MCPClient
+from SIO import SIO
+from SIODrawer import SIODrawer
+import os
+
+def get_args():
+    amqp_conf, mcp_conf = {}, {}
+    amqp_conf["host"] = os.environ.get("AMQP_HOST", "localhost")
+    amqp_conf["port"] = os.environ.get("AMQP_PORT", 5672)
+    amqp_conf["exchange"] = os.environ.get("AMQP_EXCHANGE", "sio")
+    amqp_conf["routing_key"] = os.environ.get("AMQP_ROUTING_KEY", "#")
+    print ("AMQP configuration:", amqp_conf)
+    mcp_conf["host"] = os.environ.get("MCP_HOST", "localhost")
+    mcp_conf["port"] = os.environ.get("MCP_PORT", 9097)
+    mcp_conf["username"] = os.environ.get("MCP_USERNAME", "root")
+    mcp_conf["password"] = os.environ.get("MCP_PASSWORD", "root")
+    print ("MCP configuration:", mcp_conf)
+    return amqp_conf, mcp_conf
+
+def main():
+    # getting the required information from the user
+    amqp_conf, mcp_conf = get_args()
+    # Create an AMQP listener
+    amqp_listener = amqp.AMQPListener(amqp_conf)
+    # Create MCP Client
+    mcp_client = MCPClient(mcp_conf)
+    # SIO Drawer
+    sio_drawer = SIODrawer()
+    # Register the callback
+    sio = SIO(mcp_client, sio_drawer)
+    amqp_listener.set_callback(sio.callback)
+    amqp_listener.start()
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/requirements.txt b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/requirements.txt
new file mode 100644
index 0000000..58a8cee
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/clients/python/SIOOutputProcessor/requirements.txt
@@ -0,0 +1,7 @@
+pika >= 1.3.1
+shapely >= 1.8.5
+requests >= 2.26.0
+pillow >= 8.3.1
+numpy >= 1.19.5
+opencv-python >= 4.7
+numpy >= 1.19.5
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsRecorder/config/analytics/boxFilter.json b/deployment-examples/VideoStreamsRecorder/config/analytics/boxFilter.json
new file mode 100644
index 0000000..1dfb6e4
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/config/analytics/boxFilter.json
@@ -0,0 +1,20 @@
+[
+    {
+      "name": "plateBike_SizeFilter",
+      "type": "size",
+      "subtype": "dimension",
+      "max": 0,
+      "min": 10,
+      "classes": ["licenseplate", "motorbike"],
+      "debug": false
+    },
+    {
+      "name": "vehicle_SizeFilter",
+      "type": "size",
+      "subtype": "dimension",
+      "max": 0,
+      "min": 15,
+      "classes": ["car", "bus", "truck"],
+      "debug": false
+    }
+  ]
diff --git a/deployment-examples/VideoStreamsRecorder/config/analytics/pipelines.json b/deployment-examples/VideoStreamsRecorder/config/analytics/pipelines.json
new file mode 100644
index 0000000..77c245c
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/config/analytics/pipelines.json
@@ -0,0 +1,54 @@
+{
+    "stream1" : {
+        "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
+        "restartPolicy" : "restart",
+        "parameters" : {
+            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo1.mkv",
+            "boxFilterConfig" : "/config/analytics/boxFilter.json",
+            "detectionModel" : "gen6es",
+            "lptModel" : "gen5ss",
+            "lptFilter" : "['eu', 'us']",
+            "lptMinConfidence" : "0.5",
+            "sourceId" : "rtsp-stream-1",
+            "lptPreferAccuracyToSpeed" : "false",
+            "amqpHost" : "rabbitmq_svc",
+            "amqpPort" : "5672",
+            "amqpUser" : "guest",
+            "amqpPassword" : "guest",
+            "amqpExchange" : "sio",
+            "amqpRoutingKey" : "sio",
+            "amqpErrorOnFailure" : "true",
+            "recordTo" : "/data/media/output/video/rtsp-stream-1/",
+            "imageSaveDir" : "/data/media/output/image/rtsp-stream-1/",
+            "lptStabilizationDelay" : "10",
+            "useTracker" : "true",
+            "lptSkipCarsWithoutLPs" : "true"
+        }
+    },
+    "stream2" : {
+        "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
+        "restartPolicy" : "restart",
+        "parameters" : {
+            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo2.mkv",
+            "boxFilterConfig" : "/config/analytics/boxFilter.json",
+            "detectionModel" : "gen6es",
+            "lptModel" : "gen5ss",
+            "lptFilter" : "['eu', 'us']",
+            "lptMinConfidence" : "0.5",
+            "sourceId" : "rtsp-stream-2",
+            "lptPreferAccuracyToSpeed" : "false",
+            "amqpHost" : "rabbitmq_svc",
+            "amqpPort" : "5672",
+            "amqpUser" : "guest",
+            "amqpPassword" : "guest",
+            "amqpExchange" : "sio",
+            "amqpRoutingKey" : "sio",
+            "amqpErrorOnFailure" : "true",
+            "recordTo" : "/data/media/output/video/rtsp-stream-2/",
+            "imageSaveDir" : "/data/media/output/image/rtsp-stream-2/",
+            "lptStabilizationDelay" : "10",
+            "useTracker" : "true",
+            "lptSkipCarsWithoutLPs" : "true"
+        }
+    }
+}
diff --git a/deployment-examples/VideoStreamsRecorder/config/mcp/mcp.yml b/deployment-examples/VideoStreamsRecorder/config/mcp/mcp.yml
new file mode 100644
index 0000000..9054ea0
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/config/mcp/mcp.yml
@@ -0,0 +1,33 @@
+# RabbitMQ configuration. Must match that used by SIO pipelines
+amqp:
+  enable: true
+  host: rabbitmq_svc
+  username: guest
+  password: guest
+  exchange: sio
+  routingKey: "#"
+  maxLengthSize: 100Mb
+backend:
+  host: 0.0.0.0
+  port: 9097
+  username: root
+  password: root
+# Database configuration
+sqlite:
+  enable: true
+  path: /data/sighthound/db/sqlite.db
+  auditLogFile: /data/sighthound/logs/mcp/sqlite.log
+  auditMaxMb: 100
+# Path where media is being recorded. Must match that used by SIO pipelines
+media:
+  path: /data/sighthound/media
+# Cleaner configuration defining lifecycle of the media and storage constraints
+cleaner:
+  enable: true
+  maxDiskUtilization: 90
+  maxMediaSize: 2 GB
+  auditLogFile: /data/sighthound/logs/mcp/cleaner.log
+  auditMaxMb: 100
+logs:
+  level: info
+  format: human-readable
diff --git a/deployment-examples/VideoStreamsRecorder/config/rabbitmq/definitions.json b/deployment-examples/VideoStreamsRecorder/config/rabbitmq/definitions.json
new file mode 100644
index 0000000..983e765
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/config/rabbitmq/definitions.json
@@ -0,0 +1,60 @@
+{
+    "rabbit_version": "3.8.20",
+    "rabbitmq_version": "3.8.20",
+    "product_name": "RabbitMQ",
+    "product_version": "3.8.20",
+    "users": [
+      {
+        "name": "guest",
+        "password_hash": "YMmuH8796TNxLiwksKPOEfaI4usEoH1lYsdYzhcYXQq5wMlD",
+        "hashing_algorithm": "rabbit_password_hashing_sha256",
+        "tags": "administrator",
+        "limits": {}
+      }
+    ],
+    "vhosts": [
+      {
+        "name": "/"
+      }
+    ],
+    "permissions": [
+      {
+        "user": "guest",
+        "vhost": "/",
+        "configure": ".",
+        "write": ".",
+        "read": ".*"
+      }
+    ],
+    "topic_permissions": [],
+    "parameters": [],
+    "global_parameters": [
+      {
+        "name": "internal_cluster_id",
+        "value": "rabbitmq-cluster-id-C82kbG-3JTiyYVyQdMbW0g"
+      }
+    ],
+    "policies": [],
+    "queues": [],
+    "exchanges": [
+      {
+        "name": "sio",
+        "vhost": "/",
+        "type": "topic",
+        "durable": true,
+        "auto_delete": false,
+        "internal": false,
+        "arguments": { "expires" : 60000 }
+      },
+      {
+        "name": "aqueduct",
+        "vhost": "/",
+        "type": "topic",
+        "durable": true,
+        "auto_delete": false,
+        "internal": false,
+        "arguments": { "expires" : 60000 }
+      }
+    ],
+    "bindings": []
+  }
\ No newline at end of file
diff --git a/deployment-examples/VideoStreamsRecorder/config/rabbitmq/rabbitmq.conf b/deployment-examples/VideoStreamsRecorder/config/rabbitmq/rabbitmq.conf
new file mode 100644
index 0000000..9a4cc8a
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/config/rabbitmq/rabbitmq.conf
@@ -0,0 +1,13 @@
+default_user = guest
+default_pass = guest
+
+listeners.tcp.default = 5672
+management.tcp.port = 15672
+web_stomp.tcp.port = 15674
+
+management.load_definitions = /etc/rabbitmq/definitions.json
+
+# This needs to be removed when rabbitmq is exposed outside the docker environment
+# in production, as it makes the UI and topics/queues accessible from the loopback guest user
+disk_free_limit.absolute = 5368709120B
+loopback_users.guest = false
diff --git a/deployment-examples/VideoStreamsRecorder/docker-compose.yml b/deployment-examples/VideoStreamsRecorder/docker-compose.yml
new file mode 100644
index 0000000..93b17a8
--- /dev/null
+++ b/deployment-examples/VideoStreamsRecorder/docker-compose.yml
@@ -0,0 +1,86 @@
+version: "2.3"
+services:
+
+  # By default pipelines.json will point to streams served by this container.
+  # If you point to your own cameras or streams, this container has no other
+  # function and can be disabled.
+  live555_svc:
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/live555:2.0.3-examples
+    container_name: sample-live555
+    restart: unless-stopped
+    ports:
+      - "8554:554"
+
+  # AMQP broker to receive analytics data
+  rabbitmq_svc:
+    image: docker.io/rabbitmq:3.8-management
+    container_name: sample-rabbitmq
+    restart: unless-stopped
+    volumes:
+      - ./config/rabbitmq/definitions.json:/etc/rabbitmq/definitions.json
+      - ./config/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+      - rabbitmq_persistent_storage:/var/lib/rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
+      timeout: 30s
+      retries: 3
+
+  # Media control proxy service, providing access to media and managing its lifecycle
+  mcp_svc:
+    container_name: sample-mcp
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/mcp:1.3.0
+    restart: unless-stopped
+    mem_limit: 1G
+    mem_reservation: 512M
+    volumes:
+      # Location of recorded media; should match that specified for SIO's pipeline configuration
+      - ./data/media:/data/sighthound/media:rw
+      # Location for MCP logs
+      - ./data/logs/mcp:/data/sighthound/logs/mcp:rw
+      # Location of MCP database
+      - ./data/mcp/db:/data/sighthound/db:rw
+      # MCP configuration
+      - ./config/mcp/mcp.yml:/etc/mcpd/default.json:ro
+    ports:
+      - "9097:9097"
+    depends_on:
+      - rabbitmq_svc
+
+  # The SIO analytics container, consuming the streams and analyzing them
+  analytics_svc:
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/sio:r230908${SIO_DOCKER_TAG_VARIANT}
+    container_name: sample-sio
+    restart: unless-stopped
+    environment:
+      # Location where SIO will place generated model engine files
+      - SIO_DATA_DIR=/data/sio-cache
+    # Container runtime defaults to `runc` if SIO_DOCKER_RUNTIME not set. Use `nvidia` if GPU is installed.
+    runtime: ${SIO_DOCKER_RUNTIME-runc}
+    volumes:
+      # Read-only shared folder for data exchange with host / other containers.
+      # We'll use it for license, config files, etc.
+      - ./config:/config:ro
+      # Writable shared folder for data exchange with host / other containers.
+      # We'll use it for storing the generated model files, data exchange folder, etc.
+      - ./data:/data
+    entrypoint:
+      - /sighthound/sio/bin/runPipelineSet
+      # Pipeline configuration file
+      - /config/analytics/pipelines.json
+      # License at the path accessible in the container
+      - --license-path=/config/sighthound-license.json
+      # Log level (info, debug, trace)
+      - --log=${SIO_LOG_LEVEL-info}
+    depends_on:
+      # This dependency can be removed with live555 if no longer necessary.
+      - live555_svc
+      - rabbitmq_svc
+      - mcp_svc
+
+
+volumes:
+  rabbitmq_persistent_storage:
diff --git a/docs/media/architecture.png b/docs/media/architecture.png
new file mode 100644
index 0000000..8b3e175
Binary files /dev/null and b/docs/media/architecture.png differ
diff --git a/docs/media/folders.png b/docs/media/folders.png
new file mode 100644
index 0000000..f955488
Binary files /dev/null and b/docs/media/folders.png differ
diff --git a/docs/media/live555.png b/docs/media/live555.png
new file mode 100644
index 0000000..8b3361d
Binary files /dev/null and b/docs/media/live555.png differ
diff --git a/docs/media/services.png b/docs/media/services.png
new file mode 100644
index 0000000..7278fd8
Binary files /dev/null and b/docs/media/services.png differ
diff --git a/examples/SIORtspOutput/src/RTSPStream.py b/examples/SIORtspOutput/src/RTSPStream.py
index 2e36e90..be08679 100644
--- a/examples/SIORtspOutput/src/RTSPStream.py
+++ b/examples/SIORtspOutput/src/RTSPStream.py
@@ -15,6 +15,7 @@
 # properties to it.
 class SighthoundRtspMediaFactory(GstRtspServer.RTSPMediaFactory):
     def __init__(self, conf):
+        self.frame = np.zeros((10, 10, 3), np.uint8)
         GstRtspServer.RTSPMediaFactory.__init__(self)
         self.conf = conf
         self.number_frames = 0
@@ -132,6 +133,9 @@ def start(self):
             loop.run()
         except Exception as e:
             print(e)
+
+    def stop(self):
+        loop.quit()
     
     def get_factory(self):
         return self.factory
\ No newline at end of file
diff --git a/examples/SIORtspOutput/src/main.py b/examples/SIORtspOutput/src/main.py
index 0bd15f2..d1adf50 100644
--- a/examples/SIORtspOutput/src/main.py
+++ b/examples/SIORtspOutput/src/main.py
@@ -42,11 +42,13 @@ def main():
     amqp_listener.set_callback(sio_drawer.stream_callback)
     def start_amqp():
         amqp_listener.start()
+        stream.stop()
     # Start the stream and the listener in parallel
-    thread = threading.Thread(target=start_amqp)
-    thread.start()
+    amqp_thread = threading.Thread(target=start_amqp)
+    amqp_thread.start()
     stream.start()
-    thread.join()
+    amqp_thread.join()
+    print("Exiting...")
     
     
 
diff --git a/examples/lib/AMQPListener.py b/examples/lib/AMQPListener.py
index 6ecc6d3..650588a 100644
--- a/examples/lib/AMQPListener.py
+++ b/examples/lib/AMQPListener.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import pika, json
 import traceback
+import socket
 
 class AMQPListener:
     host = 'localhost'
@@ -22,16 +23,20 @@ def __init__(self,conf):
     def set_callback(self, json_callback):
         self.json_callback = json_callback
 
-    def get_queue_name(self):
-        if not self.queue_name:
+    def connect(self):
+        if not self.connection:
             self.connection = pika.BlockingConnection(
-                    pika.ConnectionParameters(host=self.host,port=AMQPListener.port))
+                        pika.ConnectionParameters(host=self.host,port=self.port))
             self.channel = self.connection.channel()
 
-            self.channel.exchange_declare(exchange=AMQPListener.exchange, exchange_type='topic', durable=True)
+            self.channel.exchange_declare(exchange=self.exchange, exchange_type='topic', durable=True)
 
+    def get_queue_name(self):
+        if not self.queue_name:
+            self.connect()
             result = self.channel.queue_declare(queue='', exclusive=True)
             self.queue_name = result.method.queue
+        print(f"Using queue name {self.queue_name}")
         return self.queue_name
 
     def callback(self,ch, method, properties, body):
@@ -49,11 +54,24 @@ def start(self):
         function with single argument representing a JSON payload.
         """
         print(f"Starting AMQP Listener on {self.host}:{self.port}")
+        try:
+            self.connect()
+        except socket.gaierror as e:
+            traceback.print_exc()
+            print(f"Error connecting to AMQP host: {self.host}:{self.port}. {e}.")
+            print("Please check your AMQP configuration. Did you start RabbitMQ?")
+            print("You can also use the environment variables AMQP_HOST and AMQP_PORT to configure the host and port.")
+            return
+        except Exception as e:
+            traceback.print_exc()
+            print(f"Caught exception '{e}' connecting to AMQP")
+            return
         queue_name = self.get_queue_name()
-        self.channel.queue_bind(exchange=AMQPListener.exchange, queue=queue_name,
-                                routing_key=AMQPListener.routing_key)
+        self.channel.queue_bind(exchange=self.exchange, queue=queue_name,
+                                routing_key=self.routing_key)
         self.channel.basic_consume(
             queue=queue_name, on_message_callback=self.callback, auto_ack=True)
+        print(' [*] Listening for AMQP messages. To exit press CTRL+C')
         self.channel.start_consuming()
 
     def stop(self):
diff --git a/live555/conf/custom.env b/live555/conf/custom.env
deleted file mode 100644
index e69de29..0000000
diff --git a/mcp/conf/custom.env b/mcp/conf/custom.env
deleted file mode 100644
index e69de29..0000000
diff --git a/rabbitmq/conf/custom.env b/rabbitmq/conf/custom.env
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/sh-services b/scripts/sh-services
index 34ace72..ab356e4 100755
--- a/scripts/sh-services
+++ b/scripts/sh-services
@@ -7,7 +7,7 @@ SCRIPT_PATH="$(
 export SCRIPT_PATH
 SH_BASE="$(realpath "${SCRIPT_PATH}"/../..)"
 export SH_BASE
-SERVICES_PATH="$(realpath "${SCRIPT_PATH}"/..)"
+SERVICES_PATH="$(realpath "${SCRIPT_PATH}"/../services)"
 export SERVICES_PATH
 MEDIA_PATH="${SH_BASE}"/media
 export MEDIA_PATH
@@ -120,7 +120,7 @@ function remove_orphans() {
     for container in $containers; do
         container_name=$(docker inspect -f '{{.Name}}' "${container}")
         working_dir=$(docker inspect -f '{{(index .Config.Labels "com.docker.compose.project.working_dir")}}' "${container}")
-        if [[ "${working_dir}" == "${SERVICES_PATH}"* ]]; then
+        if [[ "${working_dir}" == "${SH_BASE}"* ]]; then
             echo "Found container ${container_name} with working dir: '${working_dir}'"
             # If the working dir does not exist anymore and starts with 'SERVICES_PATH', then remove the container
             if [[ ! -d "${working_dir}" ]]; then
@@ -361,12 +361,14 @@ function set_example () {
     for file in "${examples_path}/${example}"/*; do
         if [[ "$file" == *0001-edit.env ]]; then
             cat "$file" >> "${service_full_path}/conf/0001-edit.env"
+        elif [[ ! "$file" == *.md ]]; then
+            cp "$file" "${service_full_path}/conf"
+        else
+            cat "$file"
         fi
-        cp "$file" "${service_full_path}/conf"
     done
     echo "#" >> "${service_full_path}/conf/0001-edit.env"
     echo "EXAMPLE=${example}" >> "${service_full_path}/conf/0001-edit.env"
-    echo "SIO_ENTRYPOINT=/etc/sio/sio.json" >> "${service_full_path}/conf/0001-edit.env"
     remove_comments_and_duplicates "${service_full_path}/conf/0001-edit.env"
     merge "${service}" >>/dev/null
     echo "Example set for ${service}: ${example}"
diff --git a/amqp-stats/README.md b/services/amqp-stats/README.md
similarity index 100%
rename from amqp-stats/README.md
rename to services/amqp-stats/README.md
diff --git a/amqp-stats/conf/default.env b/services/amqp-stats/conf/default.env
similarity index 100%
rename from amqp-stats/conf/default.env
rename to services/amqp-stats/conf/default.env
diff --git a/amqp-stats/disabled b/services/amqp-stats/disabled
similarity index 100%
rename from amqp-stats/disabled
rename to services/amqp-stats/disabled
diff --git a/amqp-stats/docker-compose.yml b/services/amqp-stats/docker-compose.yml
similarity index 100%
rename from amqp-stats/docker-compose.yml
rename to services/amqp-stats/docker-compose.yml
diff --git a/live555/README.MD b/services/live555/README.MD
similarity index 100%
rename from live555/README.MD
rename to services/live555/README.MD
diff --git a/live555/conf/default.env b/services/live555/conf/default.env
similarity index 79%
rename from live555/conf/default.env
rename to services/live555/conf/default.env
index 7459735..cd604ca 100644
--- a/live555/conf/default.env
+++ b/services/live555/conf/default.env
@@ -1,4 +1,4 @@
 LIVE555_DOCKER_IMAGE=us-central1-docker.pkg.dev/ext-edge-analytics/docker/live555
-LIVE555_DOCKER_TAG=latest
+LIVE555_DOCKER_TAG=2.0.3-examples
 LIVE555_CONTAINER_NAME=live555
 SERVICE_GROUP=-dev
\ No newline at end of file
diff --git a/live555/docker-compose.yml b/services/live555/docker-compose.yml
similarity index 92%
rename from live555/docker-compose.yml
rename to services/live555/docker-compose.yml
index e851a9b..c0b7c88 100644
--- a/live555/docker-compose.yml
+++ b/services/live555/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     ports:
       - "7554:554"
     volumes:
-      - ./test-data:/mnt
+      - ./test-data:/mnt/media
     networks:
       core_sighthound:
         aliases:
diff --git a/mcp/README.md b/services/mcp/README.md
similarity index 100%
rename from mcp/README.md
rename to services/mcp/README.md
diff --git a/mcp/conf/default.env b/services/mcp/conf/default.env
similarity index 100%
rename from mcp/conf/default.env
rename to services/mcp/conf/default.env
diff --git a/mcp/conf/mcp.yml b/services/mcp/conf/mcp.yml
similarity index 100%
rename from mcp/conf/mcp.yml
rename to services/mcp/conf/mcp.yml
diff --git a/mcp/depends b/services/mcp/depends
similarity index 100%
rename from mcp/depends
rename to services/mcp/depends
diff --git a/mcp/docker-compose.yml b/services/mcp/docker-compose.yml
similarity index 100%
rename from mcp/docker-compose.yml
rename to services/mcp/docker-compose.yml
diff --git a/rabbitmq/README.md b/services/rabbitmq/README.md
similarity index 100%
rename from rabbitmq/README.md
rename to services/rabbitmq/README.md
diff --git a/rabbitmq/conf/default.env b/services/rabbitmq/conf/default.env
similarity index 100%
rename from rabbitmq/conf/default.env
rename to services/rabbitmq/conf/default.env
diff --git a/rabbitmq/conf/definitions.json b/services/rabbitmq/conf/definitions.json
similarity index 100%
rename from rabbitmq/conf/definitions.json
rename to services/rabbitmq/conf/definitions.json
diff --git a/services/rabbitmq/conf/rabbitmq.conf b/services/rabbitmq/conf/rabbitmq.conf
new file mode 100644
index 0000000..9a4cc8a
--- /dev/null
+++ b/services/rabbitmq/conf/rabbitmq.conf
@@ -0,0 +1,13 @@
+default_user = guest
+default_pass = guest
+
+listeners.tcp.default = 5672
+management.tcp.port = 15672
+web_stomp.tcp.port = 15674
+
+management.load_definitions = /etc/rabbitmq/definitions.json
+
+# This needs to be removed when rabbitmq is exposed outside the docker environment
+# in production, as it makes the UI and topics/queues accessible from the loopback guest user
+disk_free_limit.absolute = 5368709120B
+loopback_users.guest = false
diff --git a/rabbitmq/docker-compose.yml b/services/rabbitmq/docker-compose.yml
similarity index 100%
rename from rabbitmq/docker-compose.yml
rename to services/rabbitmq/docker-compose.yml
diff --git a/sio/README.md b/services/sio/README.md
similarity index 100%
rename from sio/README.md
rename to services/sio/README.md
diff --git a/sio/conf/default.env b/services/sio/conf/default.env
similarity index 93%
rename from sio/conf/default.env
rename to services/sio/conf/default.env
index 85d41a8..017303b 100644
--- a/sio/conf/default.env
+++ b/services/sio/conf/default.env
@@ -1,5 +1,5 @@
 SIO_DOCKER_IMAGE=us-central1-docker.pkg.dev/ext-edge-analytics/docker/sio
-SIO_DOCKER_TAG=r230526
+SIO_DOCKER_TAG=r230908
 SIO_LOG_LEVEL=info
 SIO_USER_PLUGINS_DIR=/lib/sio/plugins/
 SIO_APP=runPipelineSet
diff --git a/sio/conf/plugins/DistanceSensor.py b/services/sio/conf/plugins/DistanceSensor.py
similarity index 100%
rename from sio/conf/plugins/DistanceSensor.py
rename to services/sio/conf/plugins/DistanceSensor.py
diff --git a/sio/conf/sio.json b/services/sio/conf/sio.json
similarity index 100%
rename from sio/conf/sio.json
rename to services/sio/conf/sio.json
diff --git a/sio/config.sh b/services/sio/config.sh
similarity index 100%
rename from sio/config.sh
rename to services/sio/config.sh
diff --git a/sio/depends b/services/sio/depends
similarity index 100%
rename from sio/depends
rename to services/sio/depends
diff --git a/sio/docker-compose.interactive.yml b/services/sio/docker-compose.interactive.yml
similarity index 100%
rename from sio/docker-compose.interactive.yml
rename to services/sio/docker-compose.interactive.yml
diff --git a/sio/docker-compose.yml b/services/sio/docker-compose.yml
similarity index 100%
rename from sio/docker-compose.yml
rename to services/sio/docker-compose.yml
diff --git a/sio/examples/aqueduct/0099-example.env b/services/sio/examples/aqueduct/0099-example.env
similarity index 100%
rename from sio/examples/aqueduct/0099-example.env
rename to services/sio/examples/aqueduct/0099-example.env
diff --git a/sio/examples/aqueduct/README.md b/services/sio/examples/aqueduct/README.md
similarity index 100%
rename from sio/examples/aqueduct/README.md
rename to services/sio/examples/aqueduct/README.md
diff --git a/sio/examples/aqueduct/sio.json b/services/sio/examples/aqueduct/sio.json
similarity index 100%
rename from sio/examples/aqueduct/sio.json
rename to services/sio/examples/aqueduct/sio.json
diff --git a/sio/examples/camera/sio.json b/services/sio/examples/camera/sio.json
similarity index 100%
rename from sio/examples/camera/sio.json
rename to services/sio/examples/camera/sio.json
diff --git a/sio/examples/folderwatch/sio.json b/services/sio/examples/folderwatch/sio.json
similarity index 100%
rename from sio/examples/folderwatch/sio.json
rename to services/sio/examples/folderwatch/sio.json
diff --git a/sio/examples/live555/sio.json b/services/sio/examples/live555/sio.json
similarity index 100%
rename from sio/examples/live555/sio.json
rename to services/sio/examples/live555/sio.json
diff --git a/sio/examples/plugins/0099-example.env b/services/sio/examples/plugins/0099-example.env
similarity index 100%
rename from sio/examples/plugins/0099-example.env
rename to services/sio/examples/plugins/0099-example.env
diff --git a/sio/examples/plugins/sio.json b/services/sio/examples/plugins/sio.json
similarity index 100%
rename from sio/examples/plugins/sio.json
rename to services/sio/examples/plugins/sio.json
diff --git a/sio/sio-shell.sh b/services/sio/sio-shell.sh
similarity index 100%
rename from sio/sio-shell.sh
rename to services/sio/sio-shell.sh
diff --git a/sio/conf/custom.env b/sio/conf/custom.env
deleted file mode 100644
index e69de29..0000000