changed headers to hpp. Coding style