Organize and cleanup main settings headers

Change-Id: Id0c9c02aaab981835d663b6fbfca1514b4865a3f