Converted some CD structs to the new layout scheme