restructure wres public api header file