Revert "Settings: Rearrange settings menu to get a more logical structure"

This reverts commit 971b663bf77b9f8aaf00a1b792f2a2e3bd16c84b.

Change-Id: I9c6299c5dfef20c9d7ebca4a7311955c94d30e40
Merge "Revert "Settings: Rearrange settings menu to get a more logical structure"" into kitkat