Re-organise plugins