C++11 Support
renamed the header files to .hpp