Minor comment fix
Move header files back to include dir