Organise into rough groups, add a couple more plugins