Plugin structure changes

Changes were made to the plugin for standardization.  A type was fixed.