Moved cpu architecture stuff into separate module