Updated the make file and split some of the h files into cpp and h files