Fixing some things
Renaming .h files to .hpp