Re-arrange and group CM system settings

Change-Id: Ic42e92ebcf6ddb1903b57733be314c857167a469