Fixing settings structure a bit.