Renammed the .h and updated the .cpp files to reflect