Rearranged header files