Move clock names into the clk structure and do muxing more properly.