Removed one last bit of the m* naming scheme
So I don't lose everything
Fixed an incorrect instruction mapping
Moved mcCPU to CPU
Made tracing look nicer and separated different ISA info storage