Moved bundles setings into separate files.