plugin help, bit of reorg and renaming