moved .h files to .hpp files
moved .h files to .hpp files