Rename all headers to *.hpp and remove includes file