Fixing organization of files, moving types to an individual header, adding the tracker message type