Moved .h files to .hpp. Fixed compile test.