Renamed pure C++ headers with hpp from h
Updated code to be more "effective"
Updated for h to hpp change
Other small changes