reorganize contents in header files