Rearrange header files