Refactor settings files a bit.