Reorganized the header of the plugin