re-organizing header files