Add 'CpuSched' & Rearrange 'Swap' sections