rearrange settings into a much cleaner structure