Updated the CMAKE File to not be redundant with the include DIRs

Updated the CMAKE File to not be redundant with the include DIRs

AND

Moved the timing.h and timing.cpp back to time.h and time.cpp ( That is where they belong I think :) )