header files reorganization