Minor improvements

Renamed header files to hpp
Added some doc comments