diff --git a/aether-apps/ott-services/cdn-local/Chart.yaml b/apps/cdn/cdn-local/Chart.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/Chart.yaml
rename to apps/cdn/cdn-local/Chart.yaml
diff --git a/aether-apps/ott-services/cdn-local/templates/_helpers.tpl b/apps/cdn/cdn-local/templates/_helpers.tpl
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/_helpers.tpl
rename to apps/cdn/cdn-local/templates/_helpers.tpl
diff --git a/aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl b/apps/cdn/cdn-local/templates/bin/_run-nginx.sh.tpl
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
rename to apps/cdn/cdn-local/templates/bin/_run-nginx.sh.tpl
diff --git a/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml b/apps/cdn/cdn-local/templates/configmap-nginx.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
rename to apps/cdn/cdn-local/templates/configmap-nginx.yaml
diff --git a/aether-apps/ott-services/cdn-local/templates/networks.yaml b/apps/cdn/cdn-local/templates/networks.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/networks.yaml
rename to apps/cdn/cdn-local/templates/networks.yaml
diff --git a/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml b/apps/cdn/cdn-local/templates/service-nginx.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
rename to apps/cdn/cdn-local/templates/service-nginx.yaml
diff --git a/aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml b/apps/cdn/cdn-local/templates/statefulset-cdn-local.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml
rename to apps/cdn/cdn-local/templates/statefulset-cdn-local.yaml
diff --git a/aether-apps/ott-services/cdn-local/values.yaml b/apps/cdn/cdn-local/values.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-local/values.yaml
rename to apps/cdn/cdn-local/values.yaml
diff --git a/aether-apps/ott-services/cdn-remote/Chart.yaml b/apps/cdn/cdn-remote/Chart.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/Chart.yaml
rename to apps/cdn/cdn-remote/Chart.yaml
diff --git a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl b/apps/cdn/cdn-remote/templates/_helpers.tpl
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
rename to apps/cdn/cdn-remote/templates/_helpers.tpl
diff --git a/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl b/apps/cdn/cdn-remote/templates/bin/_start-stream.sh.tpl
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
rename to apps/cdn/cdn-remote/templates/bin/_start-stream.sh.tpl
diff --git a/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml b/apps/cdn/cdn-remote/templates/configmap-video-archive.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
rename to apps/cdn/cdn-remote/templates/configmap-video-archive.yaml
diff --git a/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml b/apps/cdn/cdn-remote/templates/service-ant-media.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
rename to apps/cdn/cdn-remote/templates/service-ant-media.yaml
diff --git a/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml b/apps/cdn/cdn-remote/templates/statefulset-ant-media.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
rename to apps/cdn/cdn-remote/templates/statefulset-ant-media.yaml
diff --git a/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml b/apps/cdn/cdn-remote/templates/statefulset-video-archive.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
rename to apps/cdn/cdn-remote/templates/statefulset-video-archive.yaml
diff --git a/aether-apps/ott-services/cdn-remote/values.yaml b/apps/cdn/cdn-remote/values.yaml
similarity index 100%
rename from aether-apps/ott-services/cdn-remote/values.yaml
rename to apps/cdn/cdn-remote/values.yaml
diff --git a/aether-apps/google-phylo/Chart.yaml b/apps/google-phylo/Chart.yaml
similarity index 100%
rename from aether-apps/google-phylo/Chart.yaml
rename to apps/google-phylo/Chart.yaml
diff --git a/aether-apps/google-phylo/templates/_helpers.tpl b/apps/google-phylo/templates/_helpers.tpl
similarity index 100%
rename from aether-apps/google-phylo/templates/_helpers.tpl
rename to apps/google-phylo/templates/_helpers.tpl
diff --git a/aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl b/apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
similarity index 100%
rename from aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
rename to apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
diff --git a/aether-apps/google-phylo/templates/configmap-phylo.yaml b/apps/google-phylo/templates/configmap-phylo.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/configmap-phylo.yaml
rename to apps/google-phylo/templates/configmap-phylo.yaml
diff --git a/aether-apps/google-phylo/templates/deployment-phylo.yaml b/apps/google-phylo/templates/deployment-phylo.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/deployment-phylo.yaml
rename to apps/google-phylo/templates/deployment-phylo.yaml
diff --git a/aether-apps/google-phylo/templates/deployment-wowza-server.yaml b/apps/google-phylo/templates/deployment-wowza-server.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/deployment-wowza-server.yaml
rename to apps/google-phylo/templates/deployment-wowza-server.yaml
diff --git a/aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml b/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml
rename to apps/google-phylo/templates/service-phylo-rabbitmq.yaml
diff --git a/aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml b/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml
rename to apps/google-phylo/templates/service-phylo-rtsp-server.yaml
diff --git a/aether-apps/google-phylo/templates/service-wowza.yaml b/apps/google-phylo/templates/service-wowza.yaml
similarity index 100%
rename from aether-apps/google-phylo/templates/service-wowza.yaml
rename to apps/google-phylo/templates/service-wowza.yaml
diff --git a/aether-apps/google-phylo/values.yaml b/apps/google-phylo/values.yaml
similarity index 100%
rename from aether-apps/google-phylo/values.yaml
rename to apps/google-phylo/values.yaml
diff --git a/aether-apps/infosys-deepstream/Chart.yaml b/apps/infosys-deepstream/Chart.yaml
similarity index 100%
rename from aether-apps/infosys-deepstream/Chart.yaml
rename to apps/infosys-deepstream/Chart.yaml
diff --git a/aether-apps/infosys-deepstream/files/infer_config.txt b/apps/infosys-deepstream/files/infer_config.txt
similarity index 100%
rename from aether-apps/infosys-deepstream/files/infer_config.txt
rename to apps/infosys-deepstream/files/infer_config.txt
diff --git a/aether-apps/infosys-deepstream/files/infer_config.txt.license b/apps/infosys-deepstream/files/infer_config.txt.license
similarity index 100%
rename from aether-apps/infosys-deepstream/files/infer_config.txt.license
rename to apps/infosys-deepstream/files/infer_config.txt.license
diff --git a/aether-apps/infosys-deepstream/files/msg_config.txt b/apps/infosys-deepstream/files/msg_config.txt
similarity index 100%
rename from aether-apps/infosys-deepstream/files/msg_config.txt
rename to apps/infosys-deepstream/files/msg_config.txt
diff --git a/aether-apps/infosys-deepstream/files/msg_config.txt.license b/apps/infosys-deepstream/files/msg_config.txt.license
similarity index 100%
rename from aether-apps/infosys-deepstream/files/msg_config.txt.license
rename to apps/infosys-deepstream/files/msg_config.txt.license
diff --git a/aether-apps/infosys-deepstream/files/tracker_config.yml b/apps/infosys-deepstream/files/tracker_config.yml
similarity index 100%
rename from aether-apps/infosys-deepstream/files/tracker_config.yml
rename to apps/infosys-deepstream/files/tracker_config.yml
diff --git a/aether-apps/infosys-deepstream/templates/_helpers.tpl b/apps/infosys-deepstream/templates/_helpers.tpl
similarity index 100%
rename from aether-apps/infosys-deepstream/templates/_helpers.tpl
rename to apps/infosys-deepstream/templates/_helpers.tpl
diff --git a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl b/apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
similarity index 100%
rename from aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
rename to apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
diff --git a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl b/apps/infosys-deepstream/templates/config/_main_config.txt.tpl
similarity index 100%
rename from aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
rename to apps/infosys-deepstream/templates/config/_main_config.txt.tpl
diff --git a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml b/apps/infosys-deepstream/templates/configmap-deepstream.yaml
similarity index 100%
rename from aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
rename to apps/infosys-deepstream/templates/configmap-deepstream.yaml
diff --git a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml b/apps/infosys-deepstream/templates/deployment-deepstream.yaml
similarity index 100%
rename from aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
rename to apps/infosys-deepstream/templates/deployment-deepstream.yaml
diff --git a/aether-apps/infosys-deepstream/values.yaml b/apps/infosys-deepstream/values.yaml
similarity index 100%
rename from aether-apps/infosys-deepstream/values.yaml
rename to apps/infosys-deepstream/values.yaml
diff --git a/comac/Chart.yaml b/comac/Chart.yaml
deleted file mode 100644
index ad9912c..0000000
--- a/comac/Chart.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-name: comac
-description: An umbrella Helm chart for deploying COMAC on CORD platform
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.0
diff --git a/comac/requirements.yaml b/comac/requirements.yaml
deleted file mode 100644
index fc7a361..0000000
--- a/comac/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-dependencies:
-- name: base-kubernetes
-  version: 1.2.1
-  repository: https://charts.opencord.org
-- name: mcord-services
-  version: 1.1.8
-  repository: https://charts.opencord.org
-  condition: mcord-services.enabled
-- name: seba-services
-  version: 1.2.8
-  repository: https://charts.opencord.org
-  condition: seba-services.enabled
-- name: onos
-  version: 1.1.3
-  repository: https://charts.opencord.org
-  condition: mcord-services.progran.enabled
-  alias: onos-progran
diff --git a/comac/templates/.gitignore b/comac/templates/.gitignore
deleted file mode 100644
index db6ed6a..0000000
--- a/comac/templates/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*
-!.gitignore
diff --git a/comac/values.yaml b/comac/values.yaml
deleted file mode 100644
index c017828..0000000
--- a/comac/values.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-onos-progran:
-  nameOverride: "onos-progran"
-  images:
-    onos:
-      repository: 'omecproject/onos-progran'
-      tag: '1.0.0'
-  services:
-    openflow:
-      nodePort: 31654
-    ssh:
-      nodePort: 30116
-    ui:
-      nodePort: 30121
-    debugger:
-      nodePort: 30556
-    progran:
-      type: NodePort
-      port: 4010
-      nodePort: 30410
-
-mcord-services:
-  enabled: true
-  onosFabricRestService: "cord-platform-onos-ui.default.svc.cluster.local"
-  onosProgranRestService: "comac-onos-progran-ui.default.svc.cluster.local"
-  progran:
-    image:
-      repository: 'omecproject/progran-synchronizer'
-      tag: 'comac-1.0.0'
-      pullPolicy: 'IfNotPresent'
-    onosProgranRestService: "comac-onos-progran-ui.default.svc.cluster.local"
-  mcord-subscriber:
-    image:
-      repository: 'omecproject/mcord-synchronizer'
-      tag: 'comac-1.0.0'
-      pullPolicy: 'IfNotPresent'
-  onos-service:
-    kafkaService: "cord-platform-kafka"
-    onosRestService: "cord-platform-onos-cord-ui.default.svc.cluster.local"
-    enabled: true
-
-seba-services:
-  enabled: false
-  # Disable onos-service and fabric from SEBA to avoid conflict with MCORD services
-  # Note that Helm 2.15 or higher is required for nested dependency configs work properly
-  onos-service:
-    enabled: false
-  fabric:
-    enabled: false
-
-  onosRestService: "cord-platform-onos-ui.default.svc.cluster.local"
-  kafkaService: "cord-platform-kafka.default.svc.cluster.local:9092"
-  volt:
-    kafkaService: "cord-platform-kafka"
-    volthaRestService: "voltha.voltha.svc.cluster.local"
-    onosRestService: "cord-platform-onos-ui.default.svc.cluster.local"
-  fabric-crossconnect:
-    kafkaService: "cord-platform-kafka"
-  sadis-server:
-    kafkaBroker: "cord-platform-kafka:9092"
-
-base-kubernetes:
-  kubernetes:
-    image:
-      repository: 'omecproject/kubernetes-synchronizer'
-      tag: 'comac-1.0.0'
-      pullPolicy: 'IfNotPresent'