Testing more logical settings organization