Move stuff to plugins section