Better organisation of plugins
Merge branch 'wip' into php
Reflect the better plugin organisation for php specific ones