Tidying Plugin bundles