Move some settings into their proper locations