Restructure settings