refactor settings & bundles