relocated a few plugins to correct groups.

And spent about an hour scrolling through the masterlist just to check
things over and it is looking quite good, couldn't find any errors at
all.