General cleanup. Organize bundles, update settings/mappings