Reorganize all header files