Better organisation of plugins