Still fixing broken references.
Paring the BundleConfig back to basics.