Reorganise header files