Rearrange the bundle plugins so that the config is next to the plugins so it's easier to maintain.

Signed-off-by: Geoff Lane <geoff@zorched.net>