Move some settings to separate files