Moved messenger files in to a seperate folder; Updated Makefile to reflect changes