Revert "Reorganize Settings/System"

This reverts commit 838020528b16483dedb534ea1274a17ee25ba827.

Conflicts:
	res/values-es/cm_strings.xml