Remapped the files to the right headers
Added message header files