Refactoring the plugin header files
merge conflicts