diff --git a/.gitignore b/.gitignore
index d4095b4..de05d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /libstoragemgmt-1.8.5.tar.gz
 /libstoragemgmt-1.8.6.tar.gz
 /libstoragemgmt-1.8.7.tar.gz
+/libstoragemgmt-1.8.8.tar.gz
diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec
index 79670f6..cb9b4d9 100644
--- a/libstoragemgmt.spec
+++ b/libstoragemgmt.spec
@@ -1,7 +1,7 @@
 %bcond_without  test
 
 Name:           libstoragemgmt
-Version:        1.8.7
+Version:        1.8.8
 Release:        1%{?dist}
 Summary:        Storage array management library
 License:        LGPLv2+
@@ -9,6 +9,15 @@ URL:            https://github.com/libstorage/libstoragemgmt
 Source0:        https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-change-run-dir.patch
 Requires:       python3-%{name}
+
+# Packages that have been removed
+Obsoletes:      %{name}-netapp-plugin < %{version}-%{release}
+Obsoletes:      %{name}-nstor-plugin < %{version}-%{release}
+Obsoletes:      python2-%{name}-clibs < %{version}-%{release}
+Obsoletes:      python3-%{name}-clibs < %{version}-%{release}
+Obsoletes:      %{name}-nfs-plugin-clibs < %{version}-%{release}
+
+
 BuildRequires:  gcc gcc-c++
 BuildRequires:  autoconf automake libtool libxml2-devel check-devel perl-interpreter
 BuildRequires:  openssl-devel
@@ -45,23 +54,18 @@ developing applications that use %{name}.
 
 %package        -n python3-%{name}
 Summary:        Python 3 client libraries and plug-in support for %{name}
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-Requires:       python3-%{name}-clibs
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+# If obsoleted plugins are installed, we need to meet it's requirement
+# of having the correct version of this package functionality installed too as
+# the update occurs first, before the obsolete removes the obsoleted package.
+Provides:       python3-%{name} < %{version}-%{release}
 %{?python_provide:%python_provide python3-%{name}}
 
 %description    -n python3-%{name}
 This contains python 3 client libraries as well as python framework
 support and open source plug-ins written in python 3.
 
-%package        -n python3-%{name}-clibs
-Summary:        Python 3 C extension module for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-%{name}-clibs}
-
-%description    -n python3-%{name}-clibs
-This package contains python 3 client C extension libraries.
-
 %package        smis-plugin
 Summary:        Files for SMI-S generic array support for %{name}
 BuildRequires:  python3-pywbem
@@ -78,20 +82,6 @@ Requires(postun): python3-%{name} = %{version}
 The %{name}-smis-plugin package contains plug-in for generic SMI-S array
 support.
 
-
-%package        netapp-plugin
-Summary:        Files for NetApp array support for %{name}
-Requires:       python3-%{name} = %{version}
-Requires(post): python3-%{name} = %{version}
-Requires(postun): python3-%{name} = %{version}
-Requires:       python3-%{name} = %{version}-%{release}
-BuildArch:      noarch
-
-%description    netapp-plugin
-The %{name}-netapp-plugin package contains plug-in for NetApp array
-support.
-
-
 %package        targetd-plugin
 Summary:        Files for targetd array support for %{name}
 Requires:       python3-%{name} = %{version}
@@ -103,18 +93,6 @@ BuildArch:      noarch
 The %{name}-targetd-plugin package contains plug-in for targetd array
 support.
 
-
-%package        nstor-plugin
-Summary:        Files for NexentaStor array support for %{name}
-Requires:       python3-%{name} = %{version}
-Requires(post): python3-%{name} = %{version}
-Requires(postun): python3-%{name} = %{version}
-BuildArch:      noarch
-
-%description    nstor-plugin
-The %{name}-nstor-plugin package contains plug-in for NexentaStor array
-support.
-
 %package        udev
 Summary:        Udev files for %{name}
 
@@ -158,24 +136,14 @@ Adaptec RAID and Smart Family Controller storage management.
 %package        nfs-plugin
 Summary:        Files for NFS local filesystem support for %{name}
 Requires:       python3-%{name} = %{version}
-Requires:       %{name}-nfs-plugin-clibs = %{version}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       nfs-utils
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
-BuildArch:      noarch
 
 %description    nfs-plugin
 The nfs-plugin package contains plug-in for local NFS exports support.
 
-%package        nfs-plugin-clibs
-Summary:        Python C extension module for %{name} NFS plugin
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description    nfs-plugin-clibs
-The %{name}-nfs-plugin-clibs package contains python C
-extension for %{name} NFS plugin.
-
-
 %package        local-plugin
 Summary:        Files for local pseudo plugin of %{name}
 Requires:       python3-%{name} = %{version}
@@ -252,19 +220,6 @@ if [ $1 -eq 0 ]; then
     /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
 fi
 
-# Need to restart lsmd if plugin is new installed or removed.
-%post netapp-plugin
-if [ $1 -eq 1 ]; then
-    # New install.
-    /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
-%postun netapp-plugin
-if [ $1 -eq 0 ]; then
-    # Remove
-    /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
 # Need to restart lsmd if plugin is new installed or removed.
 %post targetd-plugin
 if [ $1 -eq 1 ]; then
@@ -278,19 +233,6 @@ if [ $1 -eq 0 ]; then
     /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
 fi
 
-# Need to restart lsmd if plugin is new installed or removed.
-%post nstor-plugin
-if [ $1 -eq 1 ]; then
-    # New install.
-    /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
-%postun nstor-plugin
-if [ $1 -eq 0 ]; then
-    # Remove
-    /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
 # Need to restart lsmd if plugin is new installed or removed.
 %post megaraid-plugin
 if [ $1 -eq 1 ]; then
@@ -381,32 +323,32 @@ fi
 %{_mandir}/man3/libstoragemgmt*
 
 %files -n python3-%{name}
-%dir %{python3_sitelib}/lsm
-%{python3_sitelib}/lsm/__init__.*
-%dir %{python3_sitelib}/lsm/external
-%{python3_sitelib}/lsm/external/*
-%{python3_sitelib}/lsm/_client.*
-%{python3_sitelib}/lsm/_common.*
-%{python3_sitelib}/lsm/_local_disk.*
-%{python3_sitelib}/lsm/_data.*
-%{python3_sitelib}/lsm/_iplugin.*
-%{python3_sitelib}/lsm/_pluginrunner.*
-%{python3_sitelib}/lsm/_transport.*
-%{python3_sitelib}/lsm/__pycache__/
-%{python3_sitelib}/lsm/version.*
-%dir %{python3_sitelib}/lsm/plugin
-%{python3_sitelib}/lsm/plugin/__init__.*
-%{python3_sitelib}/lsm/plugin/__pycache__/
-%dir %{python3_sitelib}/lsm/plugin/sim
-%{python3_sitelib}/lsm/plugin/sim/__pycache__/
-%{python3_sitelib}/lsm/plugin/sim/__init__.*
-%{python3_sitelib}/lsm/plugin/sim/simulator.*
-%{python3_sitelib}/lsm/plugin/sim/simarray.*
-%dir %{python3_sitelib}/lsm/lsmcli
-%{python3_sitelib}/lsm/lsmcli/__init__.*
-%{python3_sitelib}/lsm/lsmcli/__pycache__/
-%{python3_sitelib}/lsm/lsmcli/data_display.*
-%{python3_sitelib}/lsm/lsmcli/cmdline.*
+%dir %{python3_sitearch}/lsm
+%{python3_sitearch}/lsm/__init__.*
+%dir %{python3_sitearch}/lsm/external
+%{python3_sitearch}/lsm/external/*
+%{python3_sitearch}/lsm/_client.*
+%{python3_sitearch}/lsm/_common.*
+%{python3_sitearch}/lsm/_local_disk.*
+%{python3_sitearch}/lsm/_data.*
+%{python3_sitearch}/lsm/_iplugin.*
+%{python3_sitearch}/lsm/_pluginrunner.*
+%{python3_sitearch}/lsm/_transport.*
+%{python3_sitearch}/lsm/__pycache__/
+%{python3_sitearch}/lsm/version.*
+%dir %{python3_sitearch}/lsm/lsmcli
+%{python3_sitearch}/lsm/lsmcli/__init__.*
+%{python3_sitearch}/lsm/lsmcli/__pycache__/
+%{python3_sitearch}/lsm/lsmcli/data_display.*
+%{python3_sitearch}/lsm/lsmcli/cmdline.*
+%{python3_sitearch}/lsm/_clib.*
+
+%dir %{python3_sitelib}/sim_plugin
+%{python3_sitelib}/sim_plugin/__pycache__/
+%{python3_sitelib}/sim_plugin/__init__.*
+%{python3_sitelib}/sim_plugin/simulator.*
+%{python3_sitelib}/sim_plugin/simarray.*
+
 %{_bindir}/sim_lsmplugin
 %dir %{_libexecdir}/lsm.d
 %{_libexecdir}/lsm.d/find_unused_lun.py*
@@ -414,116 +356,96 @@ fi
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
 %{_mandir}/man1/sim_lsmplugin.1*
 
-%files -n python3-%{name}-clibs
-%{python3_sitelib}/lsm/_clib.*
-
 %files smis-plugin
-%dir %{python3_sitelib}/lsm/plugin/smispy
-%dir %{python3_sitelib}/lsm/plugin/smispy/__pycache__
-%{python3_sitelib}/lsm/plugin/smispy/__pycache__/*
-%{python3_sitelib}/lsm/plugin/smispy/__init__.*
-%{python3_sitelib}/lsm/plugin/smispy/smis.*
-%{python3_sitelib}/lsm/plugin/smispy/dmtf.*
-%{python3_sitelib}/lsm/plugin/smispy/utils.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_common.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_cap.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_sys.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_pool.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_disk.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_vol.*
-%{python3_sitelib}/lsm/plugin/smispy/smis_ag.*
+%dir %{python3_sitelib}/smispy_plugin
+%dir %{python3_sitelib}/smispy_plugin/__pycache__
+%{python3_sitelib}/smispy_plugin/__pycache__/*
+%{python3_sitelib}/smispy_plugin/__init__.*
+%{python3_sitelib}/smispy_plugin/smis.*
+%{python3_sitelib}/smispy_plugin/dmtf.*
+%{python3_sitelib}/smispy_plugin/utils.*
+%{python3_sitelib}/smispy_plugin/smis_common.*
+%{python3_sitelib}/smispy_plugin/smis_cap.*
+%{python3_sitelib}/smispy_plugin/smis_sys.*
+%{python3_sitelib}/smispy_plugin/smis_pool.*
+%{python3_sitelib}/smispy_plugin/smis_disk.*
+%{python3_sitelib}/smispy_plugin/smis_vol.*
+%{python3_sitelib}/smispy_plugin/smis_ag.*
 %{_bindir}/smispy_lsmplugin
 %{_mandir}/man1/smispy_lsmplugin.1*
 
-%files netapp-plugin
-%dir %{python3_sitelib}/lsm/plugin/ontap
-%dir %{python3_sitelib}/lsm/plugin/ontap/__pycache__
-%{python3_sitelib}/lsm/plugin/ontap/__pycache__/*
-%{python3_sitelib}/lsm/plugin/ontap/__init__.*
-%{python3_sitelib}/lsm/plugin/ontap/na.*
-%{python3_sitelib}/lsm/plugin/ontap/ontap.*
-%{_bindir}/ontap_lsmplugin
-%{_mandir}/man1/ontap_lsmplugin.1*
-
 %files targetd-plugin
-%dir %{python3_sitelib}/lsm/plugin/targetd
-%dir %{python3_sitelib}/lsm/plugin/targetd/__pycache__
-%{python3_sitelib}/lsm/plugin/targetd/__pycache__/*
-%{python3_sitelib}/lsm/plugin/targetd/__init__.*
-%{python3_sitelib}/lsm/plugin/targetd/targetd.*
+%dir %{python3_sitelib}/targetd_plugin
+%dir %{python3_sitelib}/targetd_plugin/__pycache__
+%{python3_sitelib}/targetd_plugin/__pycache__/*
+%{python3_sitelib}/targetd_plugin/__init__.*
+%{python3_sitelib}/targetd_plugin/targetd.*
 %{_bindir}/targetd_lsmplugin
 %{_mandir}/man1/targetd_lsmplugin.1*
 
-%files nstor-plugin
-%dir %{python3_sitelib}/lsm/plugin/nstor
-%dir %{python3_sitelib}/lsm/plugin/nstor/__pycache__
-%{python3_sitelib}/lsm/plugin/nstor/__pycache__/*
-%{python3_sitelib}/lsm/plugin/nstor/__init__.*
-%{python3_sitelib}/lsm/plugin/nstor/nstor.*
-%{_bindir}/nstor_lsmplugin
-%{_mandir}/man1/nstor_lsmplugin.1*
-
 %files udev
 %{_udevrulesdir}/../scan-scsi-target
 %{_udevrulesdir}/90-scsi-ua.rules
 
 %files megaraid-plugin
-%dir %{python3_sitelib}/lsm/plugin/megaraid
-%dir %{python3_sitelib}/lsm/plugin/megaraid/__pycache__
-%{python3_sitelib}/lsm/plugin/megaraid/__pycache__/*
-%{python3_sitelib}/lsm/plugin/megaraid/__init__.*
-%{python3_sitelib}/lsm/plugin/megaraid/megaraid.*
-%{python3_sitelib}/lsm/plugin/megaraid/utils.*
+%dir %{python3_sitelib}/megaraid_plugin
+%dir %{python3_sitelib}/megaraid_plugin/__pycache__
+%{python3_sitelib}/megaraid_plugin/__pycache__/*
+%{python3_sitelib}/megaraid_plugin/__init__.*
+%{python3_sitelib}/megaraid_plugin/megaraid.*
+%{python3_sitelib}/megaraid_plugin/utils.*
 %{_bindir}/megaraid_lsmplugin
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf
 %{_mandir}/man1/megaraid_lsmplugin.1*
 
 %files hpsa-plugin
-%dir %{python3_sitelib}/lsm/plugin/hpsa
-%dir %{python3_sitelib}/lsm/plugin/hpsa/__pycache__
-%{python3_sitelib}/lsm/plugin/hpsa/__pycache__/*
-%{python3_sitelib}/lsm/plugin/hpsa/__init__.*
-%{python3_sitelib}/lsm/plugin/hpsa/hpsa.*
-%{python3_sitelib}/lsm/plugin/hpsa/utils.*
+%dir %{python3_sitelib}/hpsa_plugin
+%dir %{python3_sitelib}/hpsa_plugin/__pycache__
+%{python3_sitelib}/hpsa_plugin/__pycache__/*
+%{python3_sitelib}/hpsa_plugin/__init__.*
+%{python3_sitelib}/hpsa_plugin/hpsa.*
+%{python3_sitelib}/hpsa_plugin/utils.*
 %{_bindir}/hpsa_lsmplugin
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf
 %{_mandir}/man1/hpsa_lsmplugin.1*
 
 %files nfs-plugin
-%dir %{python3_sitelib}/lsm/plugin/nfs
-%dir %{python3_sitelib}/lsm/plugin/nfs/__pycache__
-%{python3_sitelib}/lsm/plugin/nfs/__pycache__/*
-%{python3_sitelib}/lsm/plugin/nfs/__init__.*
-%{python3_sitelib}/lsm/plugin/nfs/nfs.*
+%dir %{python3_sitearch}/nfs_plugin
+%dir %{python3_sitearch}/nfs_plugin/__pycache__
+%{python3_sitearch}/nfs_plugin/__pycache__/*
+%{python3_sitearch}/nfs_plugin/__init__.*
+%{python3_sitearch}/nfs_plugin/nfs.*
+%{python3_sitearch}/nfs_plugin/nfs_clib.*
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf
 %{_bindir}/nfs_lsmplugin
 %{_mandir}/man1/nfs_lsmplugin.1*
 
-%files nfs-plugin-clibs
-%{python3_sitelib}/lsm/plugin/nfs/nfs_clib.*
-
 %files arcconf-plugin
-%dir %{python3_sitelib}/lsm/plugin/arcconf
-%dir %{python3_sitelib}/lsm/plugin/arcconf/__pycache__
-%{python3_sitelib}/lsm/plugin/arcconf/__pycache__/*
-%{python3_sitelib}/lsm/plugin/arcconf/__init__.*
-%{python3_sitelib}/lsm/plugin/arcconf/arcconf.*
-%{python3_sitelib}/lsm/plugin/arcconf/utils.*
+%dir %{python3_sitelib}/arcconf_plugin
+%dir %{python3_sitelib}/arcconf_plugin/__pycache__
+%{python3_sitelib}/arcconf_plugin/__pycache__/*
+%{python3_sitelib}/arcconf_plugin/__init__.*
+%{python3_sitelib}/arcconf_plugin/arcconf.*
+%{python3_sitelib}/arcconf_plugin/utils.*
 %{_bindir}/arcconf_lsmplugin
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf
 %{_mandir}/man1/arcconf_lsmplugin.1*
 
 %files local-plugin
-%dir %{python3_sitelib}/lsm/plugin/local
-%dir %{python3_sitelib}/lsm/plugin/local/__pycache__
-%{python3_sitelib}/lsm/plugin/local/__pycache__/*
-%{python3_sitelib}/lsm/plugin/local/__init__.*
-%{python3_sitelib}/lsm/plugin/local/local.*
+%dir %{python3_sitelib}/local_plugin
+%dir %{python3_sitelib}/local_plugin/__pycache__
+%{python3_sitelib}/local_plugin/__pycache__/*
+%{python3_sitelib}/local_plugin/__init__.*
+%{python3_sitelib}/local_plugin/local.*
 %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf
 %{_bindir}/local_lsmplugin
 %{_mandir}/man1/local_lsmplugin.1*
 
 %changelog
+* Tue Dec 15 2020 Tony Asleson <tasleson@redhat.com> - 1.8.8-1
+- Upgrade to 1.8.8 which removes a couple of plugins and reorg.
+  the plugin install directories.
+
 * Thu Dec 3 2020 Tony Asleson <tasleson@redhat.com> - 1.8.7-1
 - Upgrade to 1.8.7
 
diff --git a/sources b/sources
index 353d134..ca07069 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libstoragemgmt-1.8.7.tar.gz) = ab37ce5b4b00968d30ae09ede0acfc6a6800c04d3b4d7259bf8298249a6f16d8ce79e94a29a3ccf653e80323f4f71aeee6bbc9d700ea4ad5c279df95a8a90686
+SHA512 (libstoragemgmt-1.8.8.tar.gz) = bc4d578c678340641485eb25da1978706cd7313eade6dcec1965452d566a7ca28d414a4901f94bb964707241808424ecda638661f641ee3175cb20d8082011c3