More order in the files strcutre.
Update the plugin defnitions.