Reorganize bundles and minor rc cleanup