diff --git a/bsp-files/filter_out_from_compute b/bsp-files/filter_out_from_compute
index e0846a54..f55519b7 100644
--- a/bsp-files/filter_out_from_compute
+++ b/bsp-files/filter_out_from_compute
@@ -11,9 +11,9 @@ cgcs-dpdk-rt-apps
 cgts-client
 cgts-client-bash-completion
 cgcs-patch-controller
-cgts-mtce-control
-cgts-mtce-storage
-cgts-mtce-common-guestAgent
+mtce-control
+mtce-storage
+mtce-guestAgent
 cgtssys
 cinder
 cinder-api
diff --git a/bsp-files/filter_out_from_compute_lowlatency b/bsp-files/filter_out_from_compute_lowlatency
index 2dec472a..13862440 100644
--- a/bsp-files/filter_out_from_compute_lowlatency
+++ b/bsp-files/filter_out_from_compute_lowlatency
@@ -11,9 +11,9 @@ cgcs-dpdk-apps
 cgts-client
 cgts-client-bash-completion
 cgcs-patch-controller
-cgts-mtce-control
-cgts-mtce-storage
-cgts-mtce-common-guestAgent
+mtce-control
+mtce-storage
+mtce-guestAgent
 cgtssys
 cinder
 cinder-api
diff --git a/bsp-files/filter_out_from_controller b/bsp-files/filter_out_from_controller
index bb706bb5..234f499e 100644
--- a/bsp-files/filter_out_from_controller
+++ b/bsp-files/filter_out_from_controller
@@ -18,9 +18,9 @@ cgcs-dpdk-rt-dev
 cgcs-dpdk-staticdev
 cgcs-dpdk-rt-staticdev
 cgcs-dpdk-rt-apps
-cgts-mtce-compute
-cgts-mtce-storage
-cgts-mtce-common-guestServer
+mtce-compute
+mtce-storage
+mtce-guestServer
 host-guest-comm
 host-guest-comm-dev
 nfscheck
diff --git a/bsp-files/filter_out_from_smallsystem b/bsp-files/filter_out_from_smallsystem
index ca885748..fc210e71 100644
--- a/bsp-files/filter_out_from_smallsystem
+++ b/bsp-files/filter_out_from_smallsystem
@@ -1,6 +1,6 @@
 cgcs-dpdk-rt
 cgcs-dpdk-rt-apps
-cgts-mtce-storage
+mtce-storage
 computeconfig-standalone
 kernel-module-openvswitch
 platform-util-noncontroller
diff --git a/bsp-files/filter_out_from_smallsystem_lowlatency b/bsp-files/filter_out_from_smallsystem_lowlatency
index 75a2b9da..50f2277b 100644
--- a/bsp-files/filter_out_from_smallsystem_lowlatency
+++ b/bsp-files/filter_out_from_smallsystem_lowlatency
@@ -1,6 +1,6 @@
 cgcs-dpdk
 cgcs-dpdk-apps
-cgts-mtce-storage
+mtce-storage
 computeconfig-standalone
 kernel-module-openvswitch
 platform-util-noncontroller
diff --git a/bsp-files/filter_out_from_storage b/bsp-files/filter_out_from_storage
index c3b99568..c6b93ea6 100644
--- a/bsp-files/filter_out_from_storage
+++ b/bsp-files/filter_out_from_storage
@@ -15,10 +15,10 @@ cgcs-dpdk-rt-apps
 cgts-client
 cgts-client-bash-completion
 cgcs-patch-controller
-cgts-mtce-compute
-cgts-mtce-control
-cgts-mtce-common-guestServer
-cgts-mtce-common-guestAgent
+mtce-compute
+mtce-control
+mtce-guestServer
+mtce-guestAgent
 cgtssys
 cinder
 cinder-api
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index e554f74e..d6fcc9c6 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -9,14 +9,14 @@ mtce-rmon
 mtce-hwmon
 mtce-hostw
 
-# cgts-mtce-compute
-cgts-mtce-compute
+# mtce-compute
+mtce-compute
 
-# cgts-mtce-control
-cgts-mtce-control
+# mtce-control
+mtce-control
 
-# cgts-mtce-storage
-cgts-mtce-storage
+# mtce-storage
+mtce-storage
 
 # pxe-network-installer
 pxe-network-installer
diff --git a/mtce-compute/PKG-INFO b/mtce-compute/PKG-INFO
index bca1a752..987daf32 100644
--- a/mtce-compute/PKG-INFO
+++ b/mtce-compute/PKG-INFO
@@ -1,5 +1,5 @@
 Metadata-Version: 1.1
-Name: cgts-mtce-compute
+Name: mtce-compute
 Version: 1.0
 Summary: Titanium Cloud Platform Compute Node Maintenance Package
 Home-page:
diff --git a/mtce-compute/centos/build_srpm.data b/mtce-compute/centos/build_srpm.data
index 0d12d4f7..113ac7de 100644
--- a/mtce-compute/centos/build_srpm.data
+++ b/mtce-compute/centos/build_srpm.data
@@ -1,3 +1,3 @@
-SRC_DIR="$PKG_BASE/cgts-mtce-compute-1.0/scripts"
+SRC_DIR="$PKG_BASE/src"
 COPY_LIST="$SRC_DIR/*"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=5
diff --git a/mtce-compute/centos/cgts-mtce-compute.spec b/mtce-compute/centos/cgts-mtce-compute.spec
deleted file mode 100644
index 4e1e7700..00000000
--- a/mtce-compute/centos/cgts-mtce-compute.spec
+++ /dev/null
@@ -1,94 +0,0 @@
-%define local_etc_pmond      %{_sysconfdir}/pmon.d
-%define local_etc_goenabledd %{_sysconfdir}/goenabled.d
-%define local_etc_nova       %{_sysconfdir}/nova
-
-%define debug_package %{nil}
-
-Name: cgts-mtce-compute
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-Summary: Compute Node Maintenance Package
-
-Group: base
-License: Apache-2.0
-Packager: Wind River <info@windriver.com>
-URL: unknown
-
-Source0: %{name}-%{version}.tar.gz
-Source1: goenabled
-Source2: e_nova-init
-Source3: nova-cleanup
-Source4: nova-startup
-Source11: nova-cleanup.conf
-Source12: nova-compute.conf
-Source14: libvirtd.conf
-Source21: nova-goenabled.sh
-Source22: virt-support-goenabled.sh
-Source31: goenabled-compute.service
-Source32: e_nova-init.service
-
-BuildRequires: systemd
-BuildRequires: systemd-devel
-Requires: bash
-Requires: /bin/systemctl
-Requires: qemu-kvm-ev
-
-%description
-Maintenance support files for compute-only node type
-
-%prep
-%setup
-
-%build
-
-%install
-
-# Compute-Only Init Scripts (source group x)
-install -m 755 -p -D %{SOURCE1} %{buildroot}/etc/init.d/goenabledCompute
-install -m 755 -p -D %{SOURCE2} %{buildroot}/etc/init.d/e_nova-init
-install -m 755 -p -D %{SOURCE3} %{buildroot}/etc/init.d/nova-cleanup
-install -m 755 -p -D %{SOURCE4} %{buildroot}/etc/init.d/nova-startup
-
-# Compute-Only Process Monitor Config files (source group 1x)
-install -m 755 -d                %{buildroot}%{local_etc_pmond}
-install -m 755 -d                %{buildroot}%{local_etc_nova}
-install -m 644 -p -D %{SOURCE11} %{buildroot}%{local_etc_nova}/nova-cleanup.conf
-install -m 644 -p -D %{SOURCE12} %{buildroot}%{local_etc_nova}/nova-compute.conf
-install -m 644 -p -D %{SOURCE14} %{buildroot}%{local_etc_pmond}/libvirtd.conf
-
-# Compute-Only Go Enabled Test (source group 2x)
-install -m 755 -d                %{buildroot}%{local_etc_goenabledd}
-install -m 755 -p -D %{SOURCE21} %{buildroot}%{local_etc_goenabledd}/nova-goenabled.sh
-install -m 755 -p -D %{SOURCE22} %{buildroot}%{local_etc_goenabledd}/virt-support-goenabled.sh
-
-# Install to systemd (source group 3x)
-install -m 644 -p -D %{SOURCE31} %{buildroot}%{_unitdir}/goenabled-compute.service
-install -m 644 -p -D %{SOURCE32} %{buildroot}%{_unitdir}/e_nova-init.service
-
-%post
-/bin/systemctl enable goenabled-compute.service
-/bin/systemctl enable e_nova-init.service
-/bin/systemctl enable qemu_clean.service
-
-%files
-%license LICENSE
-
-%defattr(-,root,root,-)
-
-/etc/init.d/goenabledCompute
-/etc/init.d/e_nova-init
-/etc/init.d/nova-cleanup
-/etc/init.d/nova-startup
-
-%{local_etc_nova}/nova-cleanup.conf
-%{local_etc_nova}/nova-compute.conf
-%{local_etc_pmond}/libvirtd.conf
-
-%{local_etc_goenabledd}/nova-goenabled.sh
-%{local_etc_goenabledd}/virt-support-goenabled.sh
-
-%{_unitdir}/goenabled-compute.service
-%{_unitdir}/e_nova-init.service
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/mtce-compute/centos/mtce-compute.spec b/mtce-compute/centos/mtce-compute.spec
new file mode 100644
index 00000000..bf72f0bc
--- /dev/null
+++ b/mtce-compute/centos/mtce-compute.spec
@@ -0,0 +1,60 @@
+%define local_etc_pmond      %{_sysconfdir}/pmon.d
+%define local_etc_goenabledd %{_sysconfdir}/goenabled.d
+%define local_etc_nova       %{_sysconfdir}/nova
+
+%define debug_package %{nil}
+
+Name: mtce-compute
+Version: 1.0
+Release: %{tis_patch_ver}%{?_tis_dist}
+Summary: Compute Node Maintenance Package
+
+Group: base
+License: Apache-2.0
+Packager: Wind River <info@windriver.com>
+URL: unknown
+
+Source0: %{name}-%{version}.tar.gz
+
+BuildRequires: systemd
+BuildRequires: systemd-devel
+Requires: bash
+Requires: /bin/systemctl
+Requires: qemu-kvm-ev
+
+%description
+Maintenance support files for compute-only node type
+
+%prep
+%setup
+
+%build
+
+%install
+make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
+
+%post
+/bin/systemctl enable goenabled-compute.service
+/bin/systemctl enable e_nova-init.service
+/bin/systemctl enable qemu_clean.service
+
+%files
+%license LICENSE
+%defattr(-,root,root,-)
+
+%{_sysconfdir}/init.d/goenabledCompute
+%{_sysconfdir}/init.d/e_nova-init
+%{_sysconfdir}/init.d/nova-cleanup
+%{_sysconfdir}/init.d/nova-startup
+%{local_etc_nova}/nova-cleanup.conf
+%{local_etc_nova}/nova-compute.conf
+%{local_etc_pmond}/libvirtd.conf
+%{local_etc_goenabledd}/nova-goenabled.sh
+%{local_etc_goenabledd}/virt-support-goenabled.sh
+%{_unitdir}/goenabled-compute.service
+%{_unitdir}/e_nova-init.service
+
+%{_datarootdir}/licenses/mtce-compute-1.0/LICENSE
+
+%clean
+rm -rf $RPM_BUILD_ROOT
diff --git a/mtce-compute/src/Makefile b/mtce-compute/src/Makefile
new file mode 100755
index 00000000..833c6f17
--- /dev/null
+++ b/mtce-compute/src/Makefile
@@ -0,0 +1,47 @@
+SOURCE1 = goenabled
+SOURCE2 = e_nova-init
+SOURCE3 = nova-cleanup
+SOURCE4 = nova-startup
+SOURCE5 = LICENSE
+
+SOURCE11 = nova-cleanup.conf
+SOURCE12 = nova-compute.conf
+SOURCE14 = libvirtd.conf
+
+SOURCE21 = nova-goenabled.sh
+SOURCE22 = virt-support-goenabled.sh
+
+SOURCE31 = goenabled-compute.service
+SOURCE32 = e_nova-init.service
+
+
+local_etc_pmond = $(_sysconfdir)/pmon.d
+local_etc_goenabledd = $(_sysconfdir)/goenabled.d
+local_etc_nova = $(_sysconfdir)/nova
+
+.PHONY: default
+
+install:
+	# nfv-plugins
+	# # Compute-Only Init Scripts (source group x)
+	install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledCompute
+	install -m 755 -p -D scripts/$(SOURCE2) $(buildroot)/$(_sysconfdir)/init.d/e_nova-init
+	install -m 755 -p -D scripts/$(SOURCE3) $(buildroot)/$(_sysconfdir)/init.d/nova-cleanup
+	install -m 755 -p -D scripts/$(SOURCE4) $(buildroot)/$(_sysconfdir)/init.d/nova-startup
+	# # Compute-Only Process Monitor Config files (source group 1x)
+	install -m 755 -d $(buildroot)/$(local_etc_pmond)
+	install -m 755 -d $(buildroot)/$(local_etc_nova)
+	install -m 644 -p -D scripts/$(SOURCE11) $(buildroot)/$(local_etc_nova)/nova-cleanup.conf
+	install -m 644 -p -D scripts/$(SOURCE12) $(buildroot)/$(local_etc_nova)/nova-compute.conf
+	install -m 644 -p -D scripts/$(SOURCE14) $(buildroot)/$(local_etc_pmond)/libvirtd.conf
+	# # Compute-Only Go Enabled Test (source group 2x)
+	install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
+	install -m 755 -p -D scripts/$(SOURCE21) $(buildroot)/$(local_etc_goenabledd)/nova-goenabled.sh
+	install -m 755 -p -D scripts/$(SOURCE22) $(buildroot)/$(local_etc_goenabledd)/virt-support-goenabled.sh
+	# Install to systemd (source group 3x)
+	install -m 644 -p -D scripts/$(SOURCE31) $(buildroot)/$(_unitdir)/goenabled-compute.service
+	install -m 644 -p -D scripts/$(SOURCE32) $(buildroot)/$(_unitdir)/e_nova-init.service
+	# for license
+	install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-compute-1.0
+	install -p -D -m 600 scripts/$(SOURCE5) $(buildroot)/$(_datarootdir)/licenses/mtce-compute-1.0/LICENSE
+
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/LICENSE b/mtce-compute/src/scripts/LICENSE
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/LICENSE
rename to mtce-compute/src/scripts/LICENSE
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init b/mtce-compute/src/scripts/e_nova-init
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init
rename to mtce-compute/src/scripts/e_nova-init
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init.service b/mtce-compute/src/scripts/e_nova-init.service
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/e_nova-init.service
rename to mtce-compute/src/scripts/e_nova-init.service
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled b/mtce-compute/src/scripts/goenabled
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled
rename to mtce-compute/src/scripts/goenabled
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled-compute.service b/mtce-compute/src/scripts/goenabled-compute.service
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/goenabled-compute.service
rename to mtce-compute/src/scripts/goenabled-compute.service
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/libvirtd.conf b/mtce-compute/src/scripts/libvirtd.conf
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/libvirtd.conf
rename to mtce-compute/src/scripts/libvirtd.conf
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup b/mtce-compute/src/scripts/nova-cleanup
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup
rename to mtce-compute/src/scripts/nova-cleanup
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup.conf b/mtce-compute/src/scripts/nova-cleanup.conf
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-cleanup.conf
rename to mtce-compute/src/scripts/nova-cleanup.conf
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-compute.conf b/mtce-compute/src/scripts/nova-compute.conf
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-compute.conf
rename to mtce-compute/src/scripts/nova-compute.conf
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-goenabled.sh b/mtce-compute/src/scripts/nova-goenabled.sh
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-goenabled.sh
rename to mtce-compute/src/scripts/nova-goenabled.sh
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-init.service b/mtce-compute/src/scripts/nova-init.service
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-init.service
rename to mtce-compute/src/scripts/nova-init.service
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/nova-startup b/mtce-compute/src/scripts/nova-startup
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/nova-startup
rename to mtce-compute/src/scripts/nova-startup
diff --git a/mtce-compute/cgts-mtce-compute-1.0/scripts/virt-support-goenabled.sh b/mtce-compute/src/scripts/virt-support-goenabled.sh
similarity index 100%
rename from mtce-compute/cgts-mtce-compute-1.0/scripts/virt-support-goenabled.sh
rename to mtce-compute/src/scripts/virt-support-goenabled.sh
diff --git a/mtce-control/PKG-INFO b/mtce-control/PKG-INFO
index ef610055..cf6801e1 100644
--- a/mtce-control/PKG-INFO
+++ b/mtce-control/PKG-INFO
@@ -1,5 +1,5 @@
 Metadata-Version: 1.1
-Name: cgts-mtce-control
+Name: mtce-control
 Version: 1.0
 Summary: Titanium Cloud Platform Controller Node Maintenance Package
 Home-page:
diff --git a/mtce-control/centos/build_srpm.data b/mtce-control/centos/build_srpm.data
index f86ef834..8e8cb2ce 100644
--- a/mtce-control/centos/build_srpm.data
+++ b/mtce-control/centos/build_srpm.data
@@ -1,4 +1,4 @@
-SRC_DIR="$PKG_BASE/cgts-mtce-control-1.0/scripts"
+SRC_DIR="$PKG_BASE/src"
 COPY_LIST="$SRC_DIR/* \
            $PKG_BASE/LICENSE"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=5
diff --git a/mtce-control/centos/cgts-mtce-control.spec b/mtce-control/centos/mtce-control.spec
similarity index 63%
rename from mtce-control/centos/cgts-mtce-control.spec
rename to mtce-control/centos/mtce-control.spec
index 75c0f9eb..49d48f9d 100644
--- a/mtce-control/centos/cgts-mtce-control.spec
+++ b/mtce-control/centos/mtce-control.spec
@@ -1,9 +1,6 @@
-%define local_etc_pmond      /%{_sysconfdir}/pmond.d
-%define local_etc_goenabledd /%{_sysconfdir}/goenabled.d
-
 %define debug_package %{nil}
 
-Name: cgts-mtce-control
+Name: mtce-control
 Version: 1.0
 Release: %{tis_patch_ver}%{?_tis_dist}
 Summary: Titanium Cloud Platform Controller Node Maintenance Package
@@ -14,8 +11,6 @@ Packager: Wind River <info@windriver.com>
 URL: unknown
 
 Source0: %{name}-%{version}.tar.gz
-Source1: goenabled
-Source2: LICENSE
 
 BuildRequires: systemd
 BuildRequires: systemd-devel
@@ -33,15 +28,7 @@ Maintenance support files for controller-only node type
 %build
 
 %install
-
-install -m 755 -d %{buildroot}%{local_etc}
-
-# Controller-Only Process Monitor Config files
-install -m 755 -d %{buildroot}%{local_etc_pmond}
-
-# Controller-Only Go Enabled Test
-install -m 755 -d                %{buildroot}%{local_etc_goenabledd}
-
+make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
 
 %post
 if [ $1 -eq 1 ] ; then
@@ -53,6 +40,8 @@ exit 0
 %files
 %license LICENSE
 %defattr(-,root,root,-)
+%{_sysconfdir}/init.d/goenabledControl
+%{_datarootdir}/licenses/mtce-control-1.0/LICENSE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/mtce-control/src/Makefile b/mtce-control/src/Makefile
new file mode 100755
index 00000000..0c85067c
--- /dev/null
+++ b/mtce-control/src/Makefile
@@ -0,0 +1,19 @@
+SOURCE1 = goenabled
+SOURCE2 = LICENSE
+
+local_etc_pmond = $(_sysconfdir)/pmond.d
+local_etc_goenabledd = $(_sysconfdir)/goenabled.d
+
+.PHONY: default
+
+install:
+	# Controller-Only Init Scripts
+	install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledControl
+	# Controller-Only Process Monitor Config files
+	install -m 755 -d $(buildroot)/$(local_etc_pmond)
+	# Controller-Only Go Enabled Test
+	install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
+	# for license
+	install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-control-1.0
+	install -p -D -m 600 scripts/$(SOURCE2) $(buildroot)/$(_datarootdir)/licenses/mtce-control-1.0/LICENSE
+
diff --git a/mtce-control/cgts-mtce-control-1.0/scripts/LICENSE b/mtce-control/src/scripts/LICENSE
similarity index 100%
rename from mtce-control/cgts-mtce-control-1.0/scripts/LICENSE
rename to mtce-control/src/scripts/LICENSE
diff --git a/mtce-control/cgts-mtce-control-1.0/scripts/goenabled b/mtce-control/src/scripts/goenabled
similarity index 100%
rename from mtce-control/cgts-mtce-control-1.0/scripts/goenabled
rename to mtce-control/src/scripts/goenabled
diff --git a/mtce-storage/PKG-INFO b/mtce-storage/PKG-INFO
index d8bc4f28..a2ad56c7 100644
--- a/mtce-storage/PKG-INFO
+++ b/mtce-storage/PKG-INFO
@@ -1,5 +1,5 @@
 Metadata-Version: 1.1
-Name: cgts-mtce-storage
+Name: mtce-storage
 Version: 1.0
 Summary: CGTS Platform Storage Node Maintenance Package
 Home-page:
diff --git a/mtce-storage/centos/build_srpm.data b/mtce-storage/centos/build_srpm.data
index 27e90c35..4bb8c335 100644
--- a/mtce-storage/centos/build_srpm.data
+++ b/mtce-storage/centos/build_srpm.data
@@ -1,4 +1,4 @@
-SRC_DIR="$PKG_BASE/cgts-mtce-storage-1.0/scripts"
+SRC_DIR="$PKG_BASE/src"
 COPY_LIST="$SRC_DIR/* \
            $PKG_BASE/LICENSE"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=4
diff --git a/mtce-storage/centos/cgts-mtce-storage.spec b/mtce-storage/centos/cgts-mtce-storage.spec
deleted file mode 100644
index 870e39af..00000000
--- a/mtce-storage/centos/cgts-mtce-storage.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-%define local_etc_pmond      /%{_sysconfdir}/pmond.d
-%define local_etc_goenabledd /%{_sysconfdir}/goenabled.d
-%define local_etc_servicesd  /%{_sysconfdir}/services.d
-
-Name: cgts-mtce-storage
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-Summary: Titanium Cloud Platform Storage Node Maintenance Package
-
-Group: base
-License: Apache-2.0
-Packager: Wind River <info@windriver.com>
-URL: unknown
-
-Source0: %{name}-%{version}.tar.gz
-Source1: goenabled
-Source2: goenabled-storage.service
-Source3: LICENSE
-
-BuildRequires: systemd
-BuildRequires: systemd-devel
-Requires: bash
-Requires: /bin/systemctl
-
-%description
-Maintenance support files for storage-only node type
-
-%prep
-
-%build
-
-%install
-
-
-# Storage-Only Init Scripts
-install -m 755 -p -D %{SOURCE1} %{buildroot}/etc/init.d/goenabledStorage
-
-# Storage-Only Process Monitor Config files
-install -m 755 -d %{buildroot}%{local_etc_pmond}
-
-# Storage-Only Go Enabled Tests
-install -m 755 -d %{buildroot}%{local_etc_goenabledd}
-
-# Storage-Only Services
-install -m 755 -d %{buildroot}%{local_etc_servicesd}/storage
-
-# Install systemd dir
-install -m 644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}/goenabled-storage.service
-
-%post
-/bin/systemctl enable goenabled-storage.service
-
-%files
-
-%defattr(-,root,root,-)
-
-/etc/init.d/goenabledStorage
-%{_unitdir}/goenabled-storage.service
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/mtce-storage/centos/mtce-storage.spec b/mtce-storage/centos/mtce-storage.spec
new file mode 100644
index 00000000..cd656fcf
--- /dev/null
+++ b/mtce-storage/centos/mtce-storage.spec
@@ -0,0 +1,42 @@
+%define debug_package %{nil}
+
+Name: mtce-storage
+Version: 1.0
+Release: %{tis_patch_ver}%{?_tis_dist}
+Summary: Titanium Cloud Platform Storage Node Maintenance Package
+
+Group: base
+License: Apache-2.0
+Packager: Wind River <info@windriver.com>
+URL: unknown
+
+Source0: %{name}-%{version}.tar.gz
+
+BuildRequires: systemd
+BuildRequires: systemd-devel
+Requires: bash
+Requires: /bin/systemctl
+
+%description
+Maintenance support files for storage-only node type
+
+%prep
+%setup
+
+%build
+
+%install
+make install buildroot=%{buildroot} _sysconfdir=%{_sysconfdir} _unitdir=%{_unitdir} _datarootdir=%{_datarootdir}
+
+%post
+/bin/systemctl enable goenabled-storage.service
+
+%files
+%license LICENSE
+%defattr(-,root,root,-)
+%{_sysconfdir}/init.d/goenabledStorage
+%{_unitdir}/goenabled-storage.service
+%{_datarootdir}/licenses/mtce-storage-1.0/LICENSE
+
+%clean
+rm -rf $RPM_BUILD_ROOT
diff --git a/mtce-storage/src/Makefile b/mtce-storage/src/Makefile
new file mode 100755
index 00000000..645e2b5a
--- /dev/null
+++ b/mtce-storage/src/Makefile
@@ -0,0 +1,25 @@
+SOURCE1 = goenabled
+SOURCE2 = goenabled-storage.service
+SOURCE3 = LICENSE
+
+local_etc_pmond = $(_sysconfdir)/pmond.d
+local_etc_goenabledd = $(_sysconfdir)/goenabled.d
+local_etc_servicesd  = $(_sysconfdir)/services.d
+
+.PHONY: default
+
+install:
+	# Storage-Only Init Scripts
+	install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledStorage
+	# Storage-Only Process Monitor Config files
+	install -m 755 -d $(buildroot)/$(local_etc_pmond)
+	# Storage-Only Go Enabled Tests
+	install -m 755 -d $(buildroot)/$(local_etc_goenabledd)
+	# Storage-Only Services
+	install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage
+	# Install systemd dir
+	install -m 644 -p -D scripts/$(SOURCE2) $(buildroot)/$(_unitdir)/goenabled-storage.service
+	# for license
+	install -m 755 -d $(buildroot)/$(_datarootdir)/licenses/mtce-storage-1.0
+	install -p -D -m 600 scripts/$(SOURCE3) $(buildroot)/$(_datarootdir)/licenses/mtce-storage-1.0/LICENSE
+
diff --git a/mtce-storage/cgts-mtce-storage-1.0/scripts/LICENSE b/mtce-storage/src/scripts/LICENSE
similarity index 100%
rename from mtce-storage/cgts-mtce-storage-1.0/scripts/LICENSE
rename to mtce-storage/src/scripts/LICENSE
diff --git a/mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled b/mtce-storage/src/scripts/goenabled
similarity index 100%
rename from mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled
rename to mtce-storage/src/scripts/goenabled
diff --git a/mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled-storage.service b/mtce-storage/src/scripts/goenabled-storage.service
similarity index 100%
rename from mtce-storage/cgts-mtce-storage-1.0/scripts/goenabled-storage.service
rename to mtce-storage/src/scripts/goenabled-storage.service