diff --git a/README.md b/README.md
index c1ca28b..958c8ad 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ app-node-interface-metrics-exporter flux cd app
 │   ├── python3-k8sapp-node-interface-metrics-exporter    # lifecycle managemnt code  to support  flux apps
 │   ├── README.md
 │   ├── requirements.txt
-│   ├── stx-node-interface-metrics-exporter-helm      # helm Package manager  for the app
+│   ├── stx-node-interface-metrics-exporter      # helm Package manager  for the app
 │   ├── test-requirements.txt
 │   └── tox.ini
 ```
diff --git a/debian_iso_image.inc b/debian_iso_image.inc
index 269d387..7295b06 100644
--- a/debian_iso_image.inc
+++ b/debian_iso_image.inc
@@ -1 +1 @@
-stx-node-interface-metrics-exporter-helm
+stx-node-interface-metrics-exporter
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index 0a2b33e..0dbe329 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -1,3 +1,3 @@
 helm-charts/custom/node-interface-metrics-exporter-helm
 python3-k8sapp-node-interface-metrics-exporter
-stx-node-interface-metrics-exporter-helm
+stx-node-interface-metrics-exporter
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/changelog b/stx-node-interface-metrics-exporter/debian/deb_folder/changelog
similarity index 64%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/changelog
rename to stx-node-interface-metrics-exporter/debian/deb_folder/changelog
index 7594a4d..e005627 100644
--- a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/changelog
+++ b/stx-node-interface-metrics-exporter/debian/deb_folder/changelog
@@ -1,10 +1,10 @@
-stx-node-interface-metrics-exporter-helm (1.0-2) unstable; urgency=medium
+stx-node-interface-metrics-exporter (1.0-2) unstable; urgency=medium
 
   * Break out helm chart into own packages and apply auto versioning.
 
  --  Abhishek Jaiswal <abhishek.jaiswal@windriver.com>  Thu, 25 Apr 2024 20:07:42 +0000
 
-stx-node-interface-metrics-exporter-helm (1.0-1) unstable; urgency=medium
+stx-node-interface-metrics-exporter (1.0-1) unstable; urgency=medium
 
   * Initial release.
 
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/control b/stx-node-interface-metrics-exporter/debian/deb_folder/control
similarity index 84%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/control
rename to stx-node-interface-metrics-exporter/debian/deb_folder/control
index f7ca262..6661eaf 100644
--- a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/control
+++ b/stx-node-interface-metrics-exporter/debian/deb_folder/control
@@ -1,4 +1,4 @@
-Source: stx-node-interface-metrics-exporter-helm
+Source: stx-node-interface-metrics-exporter
 Section: libs
 Priority: optional
 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
 
-Package: stx-node-interface-metrics-exporter-helm
+Package: stx-node-interface-metrics-exporter
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/copyright b/stx-node-interface-metrics-exporter/debian/deb_folder/copyright
similarity index 96%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/copyright
rename to stx-node-interface-metrics-exporter/debian/deb_folder/copyright
index daced4c..8375866 100644
--- a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/copyright
+++ b/stx-node-interface-metrics-exporter/debian/deb_folder/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: stx-node-interface-metrics-exporter-helm
+Upstream-Name: stx-node-interface-metrics-exporter
 Source: https://opendev.org/starlingx/app-node-interface-metrics-exporter/
 
 Files: *
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/rules b/stx-node-interface-metrics-exporter/debian/deb_folder/rules
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/rules
rename to stx-node-interface-metrics-exporter/debian/deb_folder/rules
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/source/format b/stx-node-interface-metrics-exporter/debian/deb_folder/source/format
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/source/format
rename to stx-node-interface-metrics-exporter/debian/deb_folder/source/format
diff --git a/stx-node-interface-metrics-exporter-helm/debian/deb_folder/stx-node-interface-metrics-exporter-helm.install b/stx-node-interface-metrics-exporter/debian/deb_folder/stx-node-interface-metrics-exporter.install
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/debian/deb_folder/stx-node-interface-metrics-exporter-helm.install
rename to stx-node-interface-metrics-exporter/debian/deb_folder/stx-node-interface-metrics-exporter.install
diff --git a/stx-node-interface-metrics-exporter-helm/debian/meta_data.yaml b/stx-node-interface-metrics-exporter/debian/meta_data.yaml
similarity index 64%
rename from stx-node-interface-metrics-exporter-helm/debian/meta_data.yaml
rename to stx-node-interface-metrics-exporter/debian/meta_data.yaml
index 7e76974..151a9b7 100644
--- a/stx-node-interface-metrics-exporter-helm/debian/meta_data.yaml
+++ b/stx-node-interface-metrics-exporter/debian/meta_data.yaml
@@ -1,7 +1,7 @@
 ---
-debname: stx-node-interface-metrics-exporter-helm
+debname: stx-node-interface-metrics-exporter
 debver: 1.0-2
-src_path: stx-node-interface-metrics-exporter-helm
+src_path: stx-node-interface-metrics-exporter
 revision:
   dist: $STX_DIST
   GITREVCOUNT:
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/files/metadata.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/files/metadata.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/files/metadata.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/files/metadata.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/helmrepository.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/helmrepository.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/helmrepository.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/helmrepository.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/kustomization.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/kustomization.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/kustomization.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/kustomization.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/namespace.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/namespace.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/base/namespace.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/base/namespace.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/kustomization.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/kustomization.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/kustomization.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/kustomization.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/helmrelease.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/helmrelease.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/helmrelease.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/helmrelease.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/kustomization.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/kustomization.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/kustomization.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/kustomization.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/nime-static-overrides.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/nime-static-overrides.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/nime-static-overrides.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/nime-static-overrides.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/nime-system-overrides.yaml b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/nime-system-overrides.yaml
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/fluxcd-manifests/node-interface-metrics-exporter/nime-system-overrides.yaml
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/fluxcd-manifests/node-interface-metrics-exporter/nime-system-overrides.yaml
diff --git a/stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/helm-charts/README.md b/stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/helm-charts/README.md
similarity index 100%
rename from stx-node-interface-metrics-exporter-helm/stx-node-interface-metrics-exporter-helm/helm-charts/README.md
rename to stx-node-interface-metrics-exporter/stx-node-interface-metrics-exporter/helm-charts/README.md