Move some stuff around - cpu.h