reorganize contents in header files
reorganize contents in header files