4 files changed, 32 insertions, 11 deletions
diff --git a/docs/sections/build.rst b/docs/sections/build.rst
index b6fcdc81..5323c3a0 100644
--- a/docs/sections/build.rst
+++ b/docs/sections/build.rst
@@ -45,7 +45,12 @@ Below is a list of the repositories and their sub-modules, and the language they
  - dcaegen2.services.pm-mapper (Java)
  - dcaegen2.services.ves-mapper (Java)
  - dcaegen2.services.son-handler (Java)
+ - dcaegen2.services.kpi-ms (Java)
+ - dcaegen2.services.pmsh (Python)
+ - dcaegen2.services.datalake-handler (Java)
 
+* dcaegen2.services.son-handler (Java)
+ 
 * dcaegen2.deployments
 
  - scripts (bash, python)
@@ -57,6 +62,7 @@ Below is a list of the repositories and their sub-modules, and the language they
  - multisite-init-container (python)
  - dcae-remote-site (helm chart)
 
+
 * dcaegen2.platform
 
 * dcaegen2.platform.blueprints
@@ -77,9 +83,7 @@ Below is a list of the repositories and their sub-modules, and the language they
 
 * dcaegen2.platform.plugins
 
- - cdap (Python)
  - dcae-policy (Python)
- - docker (Python)
  - relationships (Python)
  - k8splugin (Python)
 
@@ -87,6 +91,8 @@ Below is a list of the repositories and their sub-modules, and the language they
 
 * dcaegen2.platform.servicechange-handler (Clojure)
 
+* dcaegen2.platform.ves-openapi-manager (Java)
+
 * dcaegen2.utils
 
  - onap-dcae-cbs-docker-client (Python)
diff --git a/docs/sections/images/R8_architecture_diagram.png b/docs/sections/images/R8_architecture_diagram.png
index 94235253..c29228b1 100644
--- a/docs/sections/images/R8_architecture_diagram.png
+++ b/docs/sections/images/R8_architecture_diagram.png
diff --git a/docs/sections/images/architecture_diagram b/docs/sections/images/architecture_diagram
index 4ab70d75..b79a4b7a 100644
--- a/docs/sections/images/architecture_diagram
+++ b/docs/sections/images/architecture_diagram
@@ -1 +1 @@
-<mxfile host="app.diagrams.net" modified="2021-02-16T01:21:18.194Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36" etag="fBCrF5w--oVR_YudS1rJ" version="14.3.2" type="device"><diagram id="tDj8KXzGa5euc6s5cB2h" name="Page-1">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</diagram></mxfile>
-\ No newline at end of file
+<mxfile host="app.diagrams.net" modified="2021-03-19T19:54:37.159Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" etag="3AP2DIiOsC0p_-szBS0Z" version="14.4.3" type="device"><diagram id="tDj8KXzGa5euc6s5cB2h" name="Page-1">7V1Zl5u4Ev41fU7y0H1YBTx6aadzp7cTZ3IzT/dgQ9tMMHgA9zK//koYYRAyYBuQHNx+aCMQYKnqq0VVpSt5tHr/Epjr5YNv2e6VJFjvV/L4SpJEWVfgP9TysW3RZHHbsAgcK7lo1zB1/rWTRiFp3TiWHeYujHzfjZx1vnHue549j3JtZhD4b/nLXnw3/9S1ubALDdO56RZb/+tY0TJpFYGxO3FnO4tl8mhd0rYnVia+OPkl4dK0/LdMk3x7JY8C34+231bvI9tFg4fHZdtvsuds+mKB7UV1Oox+vr4s/rf4WzDFVTD6CYbuyrxO7vJqupvkB19JwIX3G7748LbwraOPZCjAPxsfn7gO44kawAtksH7fnYTfFuj/eDS4hScHwXzpRHBeNoENDz/d+Z7vbtzNZ/wU+LrbB227JSOVPlOK7HfUvoxWLmwQ4dcwCvxf9sh3/QC2eL5no3dyXJdoMl1n4cHDORweG7YPX+0gcuDEDpITK8ey0GOGb+gVp2tzjp75BskYtgX+xrNsNHJC+lrZocbjBu9pv2eakqH/YvsrOwo+4CVvO6pRhYQUlhmCUZM2MyHURdp1N5fwSzKdB0ytdPLUwp+cm1rIZNshzjbKLyb6UEjgYTB4rjvPu/EW98zIXhKAr6BLMxkAeGYRmJYDJylzTh4bBvySpxHURxmLOjhxct/zc4gxLjnMTr1KmXqlramXKVO/d8CFQwecwnNwPEca+rQynqJSHFAxHb3ciEptDanS8JCSlJoMaoG0J/FfegbLIKU4AYYynEwamgCdmABQnABAo2hZb2v81So0o2PTHH1yGFaNelKJQJvawaszhwpJb+RXctYgKEKnsKRGo4i2CEI/jiDiv+L0/vH8FXYZ+av1JjIjx/fg0cO0RemFGVmiS62hDJC2UGDyW0GbxO0FoJBu0ach/JXV/GwblNmmKTOtSTRsDpygzYhKLW1mD4F8Hw2uF7YnsSMJQVAnw0mRJJSRbowmNJIQdFWLezRAEqkZk5CERBEJVJJoTb8VT7ddTiOJO9sMopltRn2lCRnwRhMYfzKDblvQnk8O/SBa+gvfM93bXSshK3fX3Pv+OpmMv+0o+kicE+Ym8vNTZb870U/U/UZNjv7KnBm/J3eODz7wgQd/77aTpOLjtBs62PWLj3DHMIJUN0CeDaQcuGYYOnPcPHFc/E57pzf0N8HcLuOrxHqAN1zYUdmFiU6MRriUXALbhTL1Ne9RaR4PaFZPl3gwfXq8vjM9qJQFfUUERc8rDuwRQdbZIoJ2FCRoOUgQKiDhBF5XavI6Nnc54XXZYDur0lGzyhnONw7fcVf4yuZH5oK173hRmLnzM2rYQQYgbA1ZJtzYxPUi4Rwirodftm9Qs7dIAM+WE5JeBJWmY3KCkKL5kboUUs/f7voqnIDIm7qK18J4UFeFuih2mLpqmeEypaETwEqtq5QKXKCaJBA4o5SjmqSoZdfnUa0xMKp0qrYNRg/XD+Z63V99uSCOVNaQJDHWrOpD0glgAuqCicqV1ovfmxm/js3IhHyClvIhQ7j2PPL7y7oEwiu0RcputQnpXFh3r6XblTahnZk2oR2oTRgstAmNMTrd/bj+cctwzY6vBRoO8Ehmi0fSEYAkZtEo47Fp3vOmnxcEyQadvPZBEHl9FWTh88deLyWe51YhTlbYUrR2lIg9SMJ2QdEiX1p1ZSRJy3IrFloXhVpW80oLBwJMPUOFuituN2pyu8QZtxuMuX36+PAM+3xHLJo8eBbgkwUQ2J3qKywounLDHTCACzDs5XfhPIEBvzczYPh2O/0+8r2XvjI6uTzHAZtrFzav4l4GUWJH2a9kSHOVfQlAqT3ajn2ZMg1bU6Tfa3JkDBsHa3KM3Q6ClgWiG6UciuDBsx048KejtBVW8FQ7iBXwpYUwNjnzPtPd4e8x1xoXokhW9RzA4NzQvas5xOoPcX1LooixiaPk6LAixPLMyFDngwz1UrIqXK8IKgMyZKyCAxIQfytCNPiSfYxD9fX88srNbyX7sHuDl7k+PVmHrE6xNU/eHyd1DRf4ms46REQULs01apy7/saqa8RkzA8LzIAKqOYNYcJAq0uaz5sxVGRixV+lxTPTsvSNtgwVlS1a13KXSFLK2HXZtyr/JpeqkRZy2OVppNckPwHEd7CKyR2wMZPaAY8yHfKkdVr8kyJzoYGQPhZDLlVAgHzS5bg8wV79BpReX5FYUuhNMlnLiSVKJaDSHUES+hxYIEOmAe9g8LUu8KZwu5nZ1Wg72+LD/SxtMOe/FjFqPG0i10HsFrdbZvDrCd7GiWLGvBHUfKN0hU2JIi9RvVCQPgWKF2psGPQSDKKoDIRSeX6AN5ygJwq2GxRoB2pL0K7Q1k1JrN9h2sz1579oUjMddLEE70jALB3TShDLVeAqDhluOwzrilY6sXwhkpllW1QuAED1jUC3SKLWqB7V65mWDXJFujBFdeeacquOExJVWvTTXg+/UFc5LqlTpQvoQ8PPiYQ+zeCnRmTWpOGxWRoRKUSSatXNa8esQ0/G9tr1P1Z2/KyeVyrQCO8X+9VmozwZNLErzmp5mYFhJFGBBf6VK2aVJhNG+EpHC2jcu3sSVeH3Zhfvtq2YB7uNlqa3sC/QY3CXOQb4iDt4WtveIC7E92B65qK/FCIK3CXzAIkxiTz7rjP/KKLHJUJWFBXuqIV1LiAKpHQWsNfQ8SzHQ99SQdRPKiEVXvZhTQbFr9Ciwou/11rcSxXerLpbnQ/YocJLU2+LZHiCwls3nQvvhMCLwss6neur9woH249/cqzN9BNvSC2XPd6ASv/LQfOM+4Zr0zuGqrBaE0ZfAlRQXBhnNZjtXXuu2JBqMHsa0lib02MzXM58M7D6ShSkHiPRKtF3SxOV1nM3exM8Q/H64gerupTx2+xNoJF1qCm+/nSJppPNCTS20bNXexy7yi72pZU4Nl78vYIwMk7092p1A+tUvtRfjXUcyOh+gBKcL5EgTUWCaLpGrBGrmoRbckJPLSJca/EgGp+hfnIv8K2B9SytbuVvLDd5wTe29Sn30Z1WKz48Rz84cIas6P3bEVDjef5HBZuKAhEPqibVl/cWGhfIvKt8h3YSXvCwMpPf0/HoIr2bk94GYZvQZXenoZzYYOYMQvsiugXhVOStWwsdr9myRl5RIvTXqi0eRINE3g5SDbUjt5hsDHnxCvcFfJsCX1EgCYk9+hrlxRwaD/PLwm1lPv+eMqhQilXAa3xUqu52thqaOn+aXA3V67qD+NoTzSgvJ9F8TKkApBzBCYJ0HMWBqqV21hSXpSu6rde85D9TKtRZ78w3Qnm9zgv6xT2PLDTIssm0nGG9y9Uz/aAElINnQSmO9EAHQFHpszOZGENgFGYBQ8nStGKgiLUdBBaY2X/Z0Xx51eCKlpybJhEvKGWmSaGpLe1tt02L6Ov9NOGE9zQPTGc9TZVbxNQ0YtIwynCDHjpyN2HUCWyeKyXsSdpkRwmMN3I6rlb9YdvBsAq3TBQ5JgaGzlfBOqPoTGRORH2lIVB3WyPeaKh8oxg+Mh/z9qnGUSR426EwOMKlmqwaLytzGlnRdCGSztosZHBM5kEbbgP8uzmpn6BJxo2R+ctXw5Q15QaA/D3rllPQtEPv3HJ1BTzyzDwfwyFKrLx9jXP+yYS558Cf22F42W1iR0FkEXr2EeeiQEGtzhYM6qZJcVswjViLGo0a1rmMujpX83UBjlqMNcgdh7tYWjUq00FrgloNuNRLIuSLOPfwNGYHdUMZqLTF0VtBm9AXR6Vb9GkG6kSRDJun+Cyw2y8LdWm6cQtY13UNFKLk6yn1zokVLJ4shNZBkGIhPC7Vu4Hqj+7/Acvvr/Zo+G21vK6riLYckFKoqJ7fPLK6gww62G0Sj2qZ/YKjQMx407BqWKrlDy0QDZjr9uylQDQUV61l2vpLQ/VtRXJLWxVolOgNmqWiteZVPcctAXvrVMUBcAw8F0dGypG77EpVkXJk6Y9DO1TtgyQKGou9xIUaRSj30gUnfg6ZEBqALAlc161B1hYu3KhlL4YoFIPSE5eCMDYjE/57cSHzS8BcIYHjzcI1TYPmI+G0szVBheAcUDdTubUKlGmKWKlK0UQQM6csqJFDewAL3giZP6n8tq0zZNG1ndbHmsdl9sKirWt61hXaZxpVRtoEcFh9L+XcnnMqAbCaSOFUuVtOrRFv08jyDyecCuQyBjtadELOPOS2rfNtMdgtW5S331yoEeYeD/KyjgneRLrlWXDh0dKznAs7l54Y3TOzuqtSazlw+pzZZiseLxzJmVwUacV2jpGLiRuUd47UdbUNuWhoB922dY6UCrP65MVlrra1Oz9ZdojYZKuufu47XxqkZ6FLSVnm2O9ggY++7Vu+GN9Bi36XSns11wJp4cuNrAVSKYp1ztDzw/Sur+SgkFsQGTXxpQlqmK5e7v5aiX/K18uf1p+Lxz+U6dP1kSX2Wi3dOb6/TmqRU5wtnya2baGEicnAWjne59IQqwsEZeo4soi8+o81Xime+Phk/VjdGxvr/U3ymCPQjr6QBjS+nX4+Y9ooEAKFXPaLJ6FaOnVLG5W1ItreVcXdWqsDz3Q/QgeVD34I+0oeJHS0Ka7gYeCjqdjZP3DIlg++ZaMr/g8=</diagram></mxfile>
+\ No newline at end of file
diff --git a/docs/sections/services/serviceindex.rst b/docs/sections/services/serviceindex.rst
index 9a585e5d..f6d91dd6 100644
--- a/docs/sections/services/serviceindex.rst
+++ b/docs/sections/services/serviceindex.rst
@@ -10,20 +10,35 @@ DCAE Service components
 .. toctree::
    :maxdepth: 1
 
+Collectors
+----------
+
+   ./dfc/index.rst
+   ./restconf/index.rst
+   ./snmptrap/index.rst
+   ./ves-hv/index.rst
+   ./ves-http/index.rst
+
+
+Event Processor
+---------------
+
    ./bbs-event-processor/index.rst
    ./datalake-handler/index.rst
-   ./dfc/index.rst
-   ./heartbeat-ms/index.rst
-   ./kpi-computation-ms/index.rst
    ./mapper/index.rst
    ./pm-mapper/index.rst
+
+Analytics
+---------
+
+   ./heartbeat-ms/index.rst
+   ./kpi-computation-ms/index.rst
    ./pm-subscription-handler/index.rst
-   ./prh/index.rst
-   ./restconf/index.rst
    ./slice-analysis-ms/index.rst
-   ./snmptrap/index.rst
    ./son-handler/index.rst
    ./tcagen2-docker/index.rst
-   ./ves-hv/index.rst
-   ./ves-http/index.rst
+   
+Miscellaneous Services
+----------------------
    ./ves-openapi-manager/index.rst
+