plugin rearrangement; moved stuff from U&A