Re-arrange and group CM system settings

Change-Id: Ic9348bd63cc8d486a50e379c3311fe3cf1bb3e6d