Changed *.h files to *.hpp