Reorganize
Update cdsinit settings