refactor Core\Model\Settings
follow up updates in Core\Model\Settings