Rearranged plugin.xml